diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
| commit | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch) | |
| tree | ab537a329b9613e11dce8195761f93ffe82aed24 /kmail | |
| parent | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff) | |
| download | tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kmail')
196 files changed, 1916 insertions, 1916 deletions
diff --git a/kmail/ChangeLog b/kmail/ChangeLog index 4af2bcb1e..8c7c6664c 100644 --- a/kmail/ChangeLog +++ b/kmail/ChangeLog @@ -184,7 +184,7 @@ please visit http://webcvs.kde.org Do the right thing when sending to "me@there (John Doe)" Waldo's folderless-acount-segv-fix More against destroyed last char in message - Better long/normal folder-list geometry bugfix + Better long/normal folder-list tqgeometry bugfix Don't quit while sending, and show a label while you send. 1999-02-03 Sven Radej <radej@kde.org> (KMail-1.0.16) @@ -245,7 +245,7 @@ please visit http://webcvs.kde.org 1999-01-23 Stefan Taferner <taferner@kde.org> (KMail-1.0.14) - * New feature: layout can now be switched between + * New feature: tqlayout can now be switched between "long folder list" and "short folder list". Option setable in settings->appearance. @@ -264,7 +264,7 @@ please visit http://webcvs.kde.org Now it is possible to have more folders than the screen is high and still select them in the filter dialog. * Filter Dialog: changed folder combo box to (semi) auto - resize. Changed layout of dialog to better display all + resize. Changed tqlayout of dialog to better display all elements. Also enabled vertical resizing of dialog. 1999-01-17 Stefan Taferner <taferner@kde.org> (KMail-1.0.12) @@ -553,7 +553,7 @@ Sun Sep 6 18:28:45 1998 Markus Wuebben <markus@kde.org> quoted text to catch smileys at the beginning of the line ;-) - * Main window configuration (geometry, etc.) is now + * Main window configuration (tqgeometry, etc.) is now stored again. * Composer: changed completion key from Ctrl-. to Ctrl-T diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index d970bbe8a..9c24f4598 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -316,9 +316,9 @@ with questions... length := Q_UINT16 ; little endian (native?) - value := unicode-string-value / ulong-value + value := tqunicode-string-value / ulong-value - unicode-string-value := 0*256QChar ; network-byte-order + tqunicode-string-value := 0*256QChar ; network-byte-order ulong-value := unsigned_long ; little endian @@ -334,7 +334,7 @@ Currently defined tag values are: IdMD5 5 u msgIdMD5().stripWhiteSpace() XMark 6 u xmark().stripWhiteSpace() Offset 7 l folderOffset() (not only mbox!) - LegacyStatus 8 l mLegacyStatus + LegacytqStatus 8 l mLegacytqStatus Size 9 l msgSize() Date 10 l date() File 11 u fileName() (not only maildir!) @@ -342,9 +342,9 @@ Currently defined tag values are: MDNSent 13 l mdnSentState() ReplyToAuxIdMD5 14 u replyToAuxIdMD5() StrippedSubject 15 u strippedSubjectMD5().stripWhiteSpace() - Status 16 l status() + tqStatus 16 l status() - u: unicode-string-value; l: ulong-value + u: tqunicode-string-value; l: ulong-value Proposed new (KDE 3.2 / KMail 1.6) entry format: @@ -446,7 +446,7 @@ Currently defined tags are: MBoxOffset Offset(64) Offset in mbox file (pointing to From_) MBoxLength Size(64) Length of message in mbox file (incl. From_) Size Size(64) rfc2822-size of message (in mbox: excl. From_) - Status BitField (see below) + tqStatus BitField (see below) MessageIdMD5 MD5Hash MD5Hash of _normalized_ Message-Id: MDNLink SerialNumber SerNum of MDN received for this message DNSLink SerialNumber SerNUm of DSN received for this message @@ -459,7 +459,7 @@ Currently defined tags are: "String" is either Utf8String or (Utf16String or Latin1String), depending on content -Currently allocated bits for the Status BitField are: +Currently allocated bits for the tqStatus BitField are: Bit Value: on(/off) (\\imapflag) @@ -589,11 +589,11 @@ Strategy: case. These are messages that have neither an In-Reply-To header nor a References header and have a subject that is not prefixed. In case there is a perfect parent, the current sort cache item is - appended to the parents list of unsorted children, or to that of + appended to the parents list of unsorted tqchildren, or to that of root, if there is not. A sort cache item is created in the mSortCache for the parent, if it is not already there. Messages with a parent of -1 are appended to the "unparented" list, which is later traversed and - its elements threaded. Messages with -2 as the parent are children of + its elements threaded. Messages with -2 as the parent are tqchildren of root as well, as noted above, and will remain so. Once the end of the file is reached, we should have a nicely filled @@ -677,13 +677,13 @@ Strategy: cache items happen at the same time. As previously mentioned (or not) each sort cache item holds a list of its - sorted and one of its unsorted children. Starting with the root node the + sorted and one of its unsorted tqchildren. Starting with the root node the unsorted list is first qsorted, and then merged with the list of already - sorted children. To achieve that, the heads of both lists are compared and + sorted tqchildren. To achieve that, the heads of both lists are compared and the one with the "better" key is added to the list view next by creating a KMHeaderListItem for it. That header item receives both its sort key as well as its id from the sort cache item. Should the current sort cache item have - children, it is added to the end of a queue of nodes to repeat these steps + tqchildren, it is added to the end of a queue of nodes to repeat these steps on after the current level is sorted. This way, a breadth first merge sort is performed on the sort cache items and header items are created at each node. @@ -714,7 +714,7 @@ What happens when a message arrives in the folder? After those house keeping tasks are performed, the list of as of yet imper- fectly threaded messages is traversed and our newly arrived message is considered as a new parent for each item on it. This is especially important - to ensure that parents arriving out of order after their children still end + to ensure that parents arriving out of order after their tqchildren still end up as parents. If necessary, the entries in the .sorted file of rethreaded messages are updated. An entry for the new message itself is appended to the .sorted file as well. @@ -732,9 +732,9 @@ What happens when a message is removed from the folder? In this case the msgRemoved slot kicks in and updates the headers list. First the sort cache item and header item representing our message are removed from the data structures and the ids of all items after it in the store decre- - mented. Then a list of children of the message is assembled containing those - children that have to be reparented now that our message has gone away. If - one of those children has been marked as toBeDeleted, it is simply added to + mented. Then a list of tqchildren of the message is assembled containing those + tqchildren that have to be reparented now that our message has gone away. If + one of those tqchildren has been marked as toBeDeleted, it is simply added to root at top level, because there is no need to find a parent for it if it is to go away as well. This is an optimization to avoid rethreading all messages in a thread when deleting several messages in a thread, or even the @@ -743,7 +743,7 @@ What happens when a message is removed from the folder? can be avoided. Note that that does not work when moving messages via filter action. - That list of children is then traversed and a new parent found for each one + That list of tqchildren is then traversed and a new parent found for each one using, again, findParent and findParentBySubject. When a message becomes imperfectly threaded in the process, it is added to the corresponding list. diff --git a/kmail/aboutdata.cpp b/kmail/aboutdata.cpp index 2ed80f7bc..0fa29906d 100644 --- a/kmail/aboutdata.cpp +++ b/kmail/aboutdata.cpp @@ -175,7 +175,7 @@ namespace KMail { "heiko@ist.eigentlich.net", 0 }, { "Torsten Kasch", 0, 0, 0 }, // crash fix for Solaris (cf. bug:68801) { "Jason 'vanRijn' Kasper", 0, 0, 0 }, // implemented wish 79938 (configurable font for new/unread/important messages) - { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the Status combo of the quick search + { "Martijn Klingens", 0, 0, 0 }, // fix keyboard navigation in the tqStatus combo of the quick search { "Christoph Kl\303\274nter", 0, 0, 0 }, // fix for bug:88216 (drag&drop from KAddressBook to the To: field) { "Martin Koller", 0, 0, 0 }, // optional columns in the message list { "Tobias K\303\266nig", 0, 0, 0 }, // edit recent addresses, store email<->OpenPGP key association in address book @@ -196,7 +196,7 @@ namespace KMail { "jan@simonson.pp.se", 0 }, { "Paul Sprakes", 0, 0, 0 }, // fix for bug:63619 (filter button in toolbar doesn't work), context menu clean up { "Will Stephenson", 0, 0, 0 }, // added IM status indicator - { "Hasso Tepper", 0, 0, 0 }, // improve layout of recipients editor + { "Hasso Tepper", 0, 0, 0 }, // improve tqlayout of recipients editor { "Patrick S. Vogt", I18N_NOOP("timestamp for 'Transmission completed' status messages"), "patrick.vogt@unibas.ch", 0 }, { "Jan-Oliver Wagner", I18N_NOOP("\xC3\x84gypten and Kroupware project management"), diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index b919f88ed..93616ac8f 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -23,7 +23,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtabwidget.h> #include <tqradiobutton.h> #include <tqvalidator.h> @@ -258,7 +258,7 @@ ProcmailRCParser::expandVars(const TQString &s) TQAsciiDictIterator<TQString> it( mVars ); // iterator for dict while ( it.current() ) { - expS.replace(TQString::fromLatin1("$") + it.currentKey(), *it.current()); + expS.replace(TQString::tqfromLatin1("$") + it.currentKey(), *it.current()); ++it; } @@ -306,7 +306,7 @@ AccountDialog::AccountDialog( const TQString & caption, KMAccount *account, else { TQString msg = i18n( "Account type is not supported." ); - KMessageBox::information( topLevelWidget(),msg,i18n("Configure Account") ); + KMessageBox::information( tqtopLevelWidget(),msg,i18n("Configure Account") ); return; } @@ -358,10 +358,10 @@ void AccountDialog::makeLocalAccountPage() TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page ); group->setColumnLayout(0, Qt::Horizontal); - group->layout()->setSpacing( 0 ); - group->layout()->setMargin( 0 ); - TQGridLayout *groupLayout = new TQGridLayout( group->layout() ); - groupLayout->setAlignment( TQt::AlignTop ); + group->tqlayout()->setSpacing( 0 ); + group->tqlayout()->setMargin( 0 ); + TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout() ); + groupLayout->tqsetAlignment( TQt::AlignTop ); groupLayout->setSpacing( 6 ); groupLayout->setMargin( 11 ); @@ -905,7 +905,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) // button to reload TQToolButton* button = new TQToolButton( box ); button->setAutoRaise(true); - button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); button->setFixedSize( 22, 22 ); button->setIconSet( KGlobal::iconLoader()->loadIconSet( "reload", KIcon::Small, 0 ) ); @@ -924,7 +924,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editPNS->setIconSet( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editPNS->setAutoRaise( true ); - mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mImap.editPNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editPNS->setFixedSize( 22, 22 ); connect( mImap.editPNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditPersonalNamespace()) ); @@ -936,7 +936,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editONS->setIconSet( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editONS->setAutoRaise( true ); - mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mImap.editONS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editONS->setFixedSize( 22, 22 ); connect( mImap.editONS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditOtherUsersNamespace()) ); @@ -948,7 +948,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editSNS->setIconSet( KGlobal::iconLoader()->loadIconSet( "edit", KIcon::Small, 0 ) ); mImap.editSNS->setAutoRaise( true ); - mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mImap.editSNS->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editSNS->setFixedSize( 22, 22 ); connect( mImap.editSNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSharedNamespace()) ); @@ -1127,7 +1127,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) // TODO (marc/bo): Test this mSieveConfigEditor = new SieveConfigEditor( tabWidget ); - mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() ); + mSieveConfigEditor->tqlayout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") ); connect(kapp,TQT_SIGNAL(kdisplayFontChanged()),TQT_SLOT(slotFontChanged())); @@ -1191,7 +1191,7 @@ void AccountDialog::setupSettings() mPop.loginEdit->setText( ap.login() ); mPop.passwordEdit->setText( ap.passwd()); mPop.hostEdit->setText( ap.host() ); - mPop.portEdit->setText( TQString("%1").arg( ap.port() ) ); + mPop.portEdit->setText( TQString("%1").tqarg( ap.port() ) ); mPop.usePipeliningCheck->setChecked( ap.usePipelining() ); mPop.storePasswordCheck->setChecked( ap.storePasswd() ); mPop.leaveOnServerCheck->setChecked( ap.leaveOnServer() ); @@ -1256,7 +1256,7 @@ void AccountDialog::setupSettings() mImap.loginEdit->setText( ai.login() ); mImap.passwordEdit->setText( ai.passwd()); mImap.hostEdit->setText( ai.host() ); - mImap.portEdit->setText( TQString("%1").arg( ai.port() ) ); + mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) ); mImap.autoExpungeCheck->setChecked( ai.autoExpunge() ); mImap.hiddenFoldersCheck->setChecked( ai.hiddenFolders() ); mImap.subscribedFoldersCheck->setChecked( ai.onlySubscribedFolders() ); @@ -1309,7 +1309,7 @@ void AccountDialog::setupSettings() mImap.loginEdit->setText( ai.login() ); mImap.passwordEdit->setText( ai.passwd()); mImap.hostEdit->setText( ai.host() ); - mImap.portEdit->setText( TQString("%1").arg( ai.port() ) ); + mImap.portEdit->setText( TQString("%1").tqarg( ai.port() ) ); #if 0 mImap.resourceCheck->setChecked( ai.resource() ); #endif @@ -1451,7 +1451,7 @@ void AccountDialog::slotLeaveOnServerClicked() slotEnableLeaveOnServerSize( state ); } if ( !( mCurCapa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) { - KMessageBox::information( topLevelWidget(), + KMessageBox::information( tqtopLevelWidget(), i18n("The server does not seem to support unique " "message numbers, but this is a " "requirement for leaving messages on the " @@ -1466,7 +1466,7 @@ void AccountDialog::slotLeaveOnServerClicked() void AccountDialog::slotFilterOnServerClicked() { if ( !( mCurCapa & TOP ) && mPop.filterOnServerCheck->isChecked() ) { - KMessageBox::information( topLevelWidget(), + KMessageBox::information( tqtopLevelWidget(), i18n("The server does not seem to support " "fetching message headers, but this is a " "requirement for filtering messages on the " @@ -1481,7 +1481,7 @@ void AccountDialog::slotFilterOnServerClicked() void AccountDialog::slotPipeliningClicked() { if (mPop.usePipeliningCheck->isChecked()) - KMessageBox::information( topLevelWidget(), + KMessageBox::information( tqtopLevelWidget(), i18n("Please note that this feature can cause some POP3 servers " "that do not support pipelining to send corrupted mail;\n" "this is configurable, though, because some servers support pipelining " @@ -1636,7 +1636,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa ) mPop.authAPOP->setEnabled( capa & APOP ); if ( !( capa & Pipelining ) && mPop.usePipeliningCheck->isChecked() ) { mPop.usePipeliningCheck->setChecked( false ); - KMessageBox::information( topLevelWidget(), + KMessageBox::information( tqtopLevelWidget(), i18n("The server does not seem to support " "pipelining; therefore, this option has " "been disabled.\n" @@ -1655,7 +1655,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa ) } if ( !( capa & UIDL ) && mPop.leaveOnServerCheck->isChecked() ) { mPop.leaveOnServerCheck->setChecked( false ); - KMessageBox::information( topLevelWidget(), + KMessageBox::information( tqtopLevelWidget(), i18n("The server does not seem to support unique " "message numbers, but this is a " "requirement for leaving messages on the " @@ -1668,7 +1668,7 @@ void AccountDialog::enablePopFeatures( unsigned int capa ) } if ( !( capa & TOP ) && mPop.filterOnServerCheck->isChecked() ) { mPop.filterOnServerCheck->setChecked( false ); - KMessageBox::information( topLevelWidget(), + KMessageBox::information( tqtopLevelWidget(), i18n("The server does not seem to support " "fetching message headers, but this is a " "requirement for filtering messages on the " @@ -2293,7 +2293,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, } else { ns = i18n("Shared"); } - setCaption( i18n("Edit Namespace '%1'").arg(ns) ); + setCaption( i18n("Edit Namespace '%1'").tqarg(ns) ); TQGrid* grid = new TQGrid( 2, page ); mBg = new TQButtonGroup( 0 ); @@ -2307,7 +2307,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, button->setIconSet( KGlobal::iconLoader()->loadIconSet( "editdelete", KIcon::Small, 0 ) ); button->setAutoRaise( true ); - button->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); button->setFixedSize( 22, 22 ); mLineEditMap[ mBg->insert( button ) ] = edit; } diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index e4d22eefd..21a9f8cdc 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -100,7 +100,7 @@ void AccountManager::readConfig(void) acctType = "pop"; acctName = config->readEntry("Name"); id = config->readUnsignedNumEntry("Id", 0); - if (acctName.isEmpty()) acctName = i18n("Account %1").arg(i); + if (acctName.isEmpty()) acctName = i18n("Account %1").tqarg(i); acct = create(acctType, acctName, id); if (!acct) continue; add(acct); @@ -149,7 +149,7 @@ void AccountManager::processNextCheck( bool _newMail ) kdDebug(5006) << "account " << acct->name() << " finished check" << endl; mAcctChecking.remove( acct ); kmkernel->filterMgr()->deref(); - disconnect( acct, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( acct, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( processNextCheck( bool ) ) ); } if ( mAcctChecking.isEmpty() ) { @@ -183,7 +183,7 @@ void AccountManager::processNextCheck( bool _newMail ) TQString tmp = i18n("Account %1 has no mailbox defined:\n" "mail checking aborted;\n" "check your account settings.") - .arg(curAccount->name()); + .tqarg(curAccount->name()); KMessageBox::information(0,tmp); emit checkedMail( false, mInteractive, mTotalNewInFolder ); mTotalNewMailsArrived = 0; @@ -219,11 +219,11 @@ void AccountManager::processNextCheck( bool _newMail ) } } - connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + connect( curAccount, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( processNextCheck( bool ) ) ); KPIM::BroadcastStatus::instance()->seStatusMsg( - i18n("Checking account %1 for new mail").arg(curAccount->name())); + i18n("Checking account %1 for new mail").tqarg(curAccount->name())); kdDebug(5006) << "processing next mail check for " << curAccount->name() << endl; diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index 04be2add9..6a188fbb5 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -36,7 +36,7 @@ #include <tqdir.h> #include <tqhbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqvbox.h> @@ -215,29 +215,29 @@ void AccountWizard::setupAccountTypePage() void AccountWizard::setupAccountInformationPage() { mAccountInformationPage = new TQWidget( this ); - TQGridLayout *layout = new TQGridLayout( mAccountInformationPage, 3, 2, + TQGridLayout *tqlayout = new TQGridLayout( mAccountInformationPage, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Real name:" ), mAccountInformationPage ); mRealName = new KLineEdit( mAccountInformationPage ); label->setBuddy( mRealName ); - layout->addWidget( label, 0, 0 ); - layout->addWidget( mRealName, 0, 1 ); + tqlayout->addWidget( label, 0, 0 ); + tqlayout->addWidget( mRealName, 0, 1 ); label = new TQLabel( i18n( "E-mail address:" ), mAccountInformationPage ); mEMailAddress = new KLineEdit( mAccountInformationPage ); label->setBuddy( mEMailAddress ); - layout->addWidget( label, 1, 0 ); - layout->addWidget( mEMailAddress, 1, 1 ); + tqlayout->addWidget( label, 1, 0 ); + tqlayout->addWidget( mEMailAddress, 1, 1 ); label = new TQLabel( i18n( "Organization:" ), mAccountInformationPage ); mOrganization = new KLineEdit( mAccountInformationPage ); label->setBuddy( mOrganization ); - layout->addWidget( label, 2, 0 ); - layout->addWidget( mOrganization, 2, 1 ); + tqlayout->addWidget( label, 2, 0 ); + tqlayout->addWidget( mOrganization, 2, 1 ); addPage( mAccountInformationPage, i18n( "Account Information" ) ); } @@ -245,23 +245,23 @@ void AccountWizard::setupAccountInformationPage() void AccountWizard::setupLoginInformationPage() { mLoginInformationPage = new TQWidget( this ); - TQGridLayout *layout = new TQGridLayout( mLoginInformationPage, 2, 2, + TQGridLayout *tqlayout = new TQGridLayout( mLoginInformationPage, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Login name:" ), mLoginInformationPage ); mLoginName = new KLineEdit( mLoginInformationPage ); label->setBuddy( mLoginName ); - layout->addWidget( label, 0, 0 ); - layout->addWidget( mLoginName, 0, 1 ); + tqlayout->addWidget( label, 0, 0 ); + tqlayout->addWidget( mLoginName, 0, 1 ); label = new TQLabel( i18n( "Password:" ), mLoginInformationPage ); mPassword = new KLineEdit( mLoginInformationPage ); mPassword->setEchoMode( TQLineEdit::Password ); label->setBuddy( mPassword ); - layout->addWidget( label, 1, 0 ); - layout->addWidget( mPassword, 1, 1 ); + tqlayout->addWidget( label, 1, 0 ); + tqlayout->addWidget( mPassword, 1, 1 ); addPage( mLoginInformationPage, i18n( "Login Information" ) ); } @@ -269,7 +269,7 @@ void AccountWizard::setupLoginInformationPage() void AccountWizard::setupServerInformationPage() { mServerInformationPage = new TQWidget( this ); - TQGridLayout *layout = new TQGridLayout( mServerInformationPage, 3, 2, + TQGridLayout *tqlayout = new TQGridLayout( mServerInformationPage, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); mIncomingLabel = new TQLabel( mServerInformationPage ); @@ -285,23 +285,23 @@ void AccountWizard::setupServerInformationPage() connect( mChooseLocation, TQT_SIGNAL( clicked() ), this, TQT_SLOT( chooseLocation() ) ); - layout->addWidget( mIncomingLabel, 0, 0, AlignTop ); - layout->addWidget( mIncomingLocationWdg, 0, 1 ); - layout->addWidget( mIncomingServerWdg, 0, 1 ); + tqlayout->addWidget( mIncomingLabel, 0, 0, AlignTop ); + tqlayout->addWidget( mIncomingLocationWdg, 0, 1 ); + tqlayout->addWidget( mIncomingServerWdg, 0, 1 ); TQLabel *label = new TQLabel( i18n( "Outgoing server:" ), mServerInformationPage ); mOutgoingServer = new KLineEdit( mServerInformationPage ); label->setBuddy( mOutgoingServer ); - layout->addWidget( label, 1, 0 ); - layout->addWidget( mOutgoingServer, 1, 1 ); + tqlayout->addWidget( label, 1, 0 ); + tqlayout->addWidget( mOutgoingServer, 1, 1 ); mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage ); - layout->addWidget( mOutgoingUseSSL, 2, 1 ); + tqlayout->addWidget( mOutgoingUseSSL, 2, 1 ); mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ), mServerInformationPage ); - layout->addWidget( mLocalDelivery, 3, 0 ); + tqlayout->addWidget( mLocalDelivery, 3, 0 ); connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ), mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) ); @@ -516,7 +516,7 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port ) connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), this, TQT_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) ); } void AccountWizard::checkImapCapabilities( const TQString &server, int port ) @@ -527,7 +527,7 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port ) connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), this, TQT_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) ); } void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) @@ -540,7 +540,7 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) this, TQT_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&, const TQString&, const TQString&, const TQString& ) ) ); - mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); + mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).tqarg( server ) ); } void AccountWizard::popCapabilities( const TQStringList &capaNormalList, diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp index 1ad1a69be..33a7e5837 100644 --- a/kmail/acljobs.cpp +++ b/kmail/acljobs.cpp @@ -122,7 +122,7 @@ TQString ACLJobs::permissionsToString( unsigned int permissions ) KIO::SimpleJob* ACLJobs::setACL( KIO::Slave* slave, const KURL& url, const TQString& user, unsigned int permissions ) { - TQString perm = TQString::fromLatin1( permissionsToIMAPRights( permissions ) ); + TQString perm = TQString::tqfromLatin1( permissionsToIMAPRights( permissions ) ); TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp index ccc011b3d..71475a93d 100644 --- a/kmail/actionscheduler.cpp +++ b/kmail/actionscheduler.cpp @@ -454,7 +454,7 @@ void ActionScheduler::messageFetched( KMMessage *msg ) serNumS.setNum( msg->getMsgSerNum() ); KMMessage *newMsg = new KMMessage; newMsg->fromString(msg->asString()); - newMsg->seStatus(msg->status()); + newMsg->setqStatus(msg->status()); newMsg->setComplete(msg->isComplete()); newMsg->setHeaderField( "X-KMail-Filtered", serNumS ); mSrcFolder->addMsg( newMsg ); @@ -625,7 +625,7 @@ void ActionScheduler::actionMessage(KMFilterAction::ReturnCode res) if (msg) { if ( FilterLog::instance()->isLogging() ) { TQString logText( i18n( "<b>Applying filter action:</b> %1" ) - .arg( mFilterAction->displayString() ) ); + .tqarg( mFilterAction->displayString() ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } KMFilterAction *action = mFilterAction; @@ -786,19 +786,19 @@ TQString ActionScheduler::debug() TQValueList<ActionScheduler*>::iterator it; int i = 1; for ( it = schedulerList->begin(); it != schedulerList->end(); ++it ) { - res.append( TQString( "ActionScheduler #%1.\n" ).arg( i ) ); + res.append( TQString( "ActionScheduler #%1.\n" ).tqarg( i ) ); if ((*it)->mAccount && kmkernel->find( (*it)->mAccountId )) { res.append( TQString( "Account %1, Name %2.\n" ) - .arg( (*it)->mAccountId ) - .arg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) ); + .tqarg( (*it)->mAccountId ) + .tqarg( kmkernel->acctMgr()->find( (*it)->mAccountId )->name() ) ); } - res.append( TQString( "mExecuting %1, " ).arg( (*it)->mExecuting ? "true" : "false" ) ); - res.append( TQString( "mExecutingLock %1, " ).arg( (*it)->mExecutingLock ? "true" : "false" ) ); - res.append( TQString( "mFetchExecuting %1.\n" ).arg( (*it)->mFetchExecuting ? "true" : "false" ) ); - res.append( TQString( "mOriginalSerNum %1.\n" ).arg( (*it)->mOriginalSerNum ) ); - res.append( TQString( "mMessageIt %1.\n" ).arg( ((*it)->mMessageIt != 0) ? *(*it)->mMessageIt : 0 ) ); - res.append( TQString( "mSerNums count %1, " ).arg( (*it)->mSerNums.count() ) ); - res.append( TQString( "mFetchSerNums count %1.\n" ).arg( (*it)->mFetchSerNums.count() ) ); + res.append( TQString( "mExecuting %1, " ).tqarg( (*it)->mExecuting ? "true" : "false" ) ); + res.append( TQString( "mExecutingLock %1, " ).tqarg( (*it)->mExecutingLock ? "true" : "false" ) ); + res.append( TQString( "mFetchExecuting %1.\n" ).tqarg( (*it)->mFetchExecuting ? "true" : "false" ) ); + res.append( TQString( "mOriginalSerNum %1.\n" ).tqarg( (*it)->mOriginalSerNum ) ); + res.append( TQString( "mMessageIt %1.\n" ).tqarg( ((*it)->mMessageIt != 0) ? *(*it)->mMessageIt : 0 ) ); + res.append( TQString( "mSerNums count %1, " ).tqarg( (*it)->mSerNums.count() ) ); + res.append( TQString( "mFetchSerNums count %1.\n" ).tqarg( (*it)->mFetchSerNums.count() ) ); res.append( TQString( "mResult " ) ); if ((*it)->mResult == ResultOk) res.append( TQString( "ResultOk.\n" ) ); diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp index 0cb047fd4..500529953 100644 --- a/kmail/antispamconfig.cpp +++ b/kmail/antispamconfig.cpp @@ -59,7 +59,7 @@ void AntiSpamConfig::readConfig() KConfigGroup general( &config, "General" ); unsigned int totalTools = general.readUnsignedNumEntry( "tools", 0 ); for ( unsigned int i = 1; i <= totalTools; ++i ) { - KConfigGroup tool( &config, TQString("Spamtool #%1").arg( i ) ); + KConfigGroup tool( &config, TQString("Spamtool #%1").tqarg( i ) ); if ( tool.hasKey( "ScoreHeader" ) ) { TQString name = tool.readEntry( "ScoreName" ); TQCString header = tool.readEntry( "ScoreHeader" ).latin1(); diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 427e6e6c4..4091c715c 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -50,7 +50,7 @@ #include <tqdom.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -495,7 +495,7 @@ void AntiSpamWizard::checkToolAvailability() bool found = false; for ( TQValueListIterator<SpamToolConfig> it = mToolList.begin(); it != mToolList.end(); ++it ) { - TQString text( i18n("Scanning for %1...").arg( (*it).getId() ) ); + TQString text( i18n("Scanning for %1...").tqarg( (*it).getId() ) ); mInfoPage->setScanProgressText( text ); if ( (*it).isSpamTool() && (*it).isServerBased() ) { // check the configured account for pattern in <server> @@ -517,7 +517,7 @@ void AntiSpamWizard::checkToolAvailability() } else { // check the availability of the application - KApplication::kApplication()->processEvents( 200 ); + KApplication::kApplication()->tqprocessEvents( 200 ); if ( !checkForProgram( (*it).getExecutable() ) ) { mInfoPage->addAvailableTool( (*it).getVisibleName() ); found = true; @@ -702,7 +702,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig() int registeredTools = general.readNumEntry( "tools", 0 ); for (int i = 1; i <= registeredTools; i++) { - KConfigGroup toolConfig( mConfig, groupName.arg( i ) ); + KConfigGroup toolConfig( mConfig, groupName.tqarg( i ) ); if( !toolConfig.readBoolEntry( "HeadersOnly", false ) ) mToolList.append( readToolConfig( toolConfig ) ); } @@ -714,7 +714,7 @@ void AntiSpamWizard::ConfigReader::readAndMergeConfig() int user_registeredTools = user_general.readNumEntry( "tools", 0 ); for (int i = 1; i <= user_registeredTools; i++) { - KConfigGroup toolConfig( mConfig, groupName.arg( i ) ); + KConfigGroup toolConfig( mConfig, groupName.tqarg( i ) ); if( !toolConfig.readBoolEntry( "HeadersOnly", false ) ) mergeToolConfig( readToolConfig( toolConfig ) ); } @@ -855,7 +855,7 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, TQWidget * parent, const char * name ) : ASWizPage( parent, name ) { - TQBoxLayout * layout = new TQVBoxLayout( mLayout ); + TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); mIntroText = new TQLabel( this ); mIntroText->setText( @@ -879,26 +879,26 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, "deleting the filter rules created by the wizard to get " "back to the former behavior." ) ); - layout->addWidget( mIntroText ); + tqlayout->addWidget( mIntroText ); mScanProgressText = new TQLabel( this ); mScanProgressText->setText( "" ) ; - layout->addWidget( mScanProgressText ); + tqlayout->addWidget( mScanProgressText ); mToolsList = new KListBox( this ); mToolsList->hide(); mToolsList->setSelectionMode( TQListBox::Multi ); mToolsList->setRowMode( TQListBox::FixedNumber ); mToolsList->setRowMode( 10 ); - layout->addWidget( mToolsList ); + tqlayout->addWidget( mToolsList ); connect( mToolsList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(processSelectionChange(void)) ); mSelectionHint = new TQLabel( this ); mSelectionHint->setText( "" ); - layout->addWidget( mSelectionHint ); + tqlayout->addWidget( mSelectionHint ); - layout->addStretch(); + tqlayout->addStretch(); } @@ -940,18 +940,18 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree ) : ASWizPage( parent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( mLayout ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout ); mMarkRules = new TQCheckBox( i18n("&Mark detected spam messages as read"), this ); TQWhatsThis::add( mMarkRules, i18n( "Mark messages which have been classified as spam as read.") ); - layout->addWidget( mMarkRules); + tqlayout->addWidget( mMarkRules); mMoveSpamRules = new TQCheckBox( i18n("Move &known spam to:"), this ); TQWhatsThis::add( mMoveSpamRules, i18n( "The default folder for spam messages is the trash folder, " "but you may change that in the folder view below.") ); - layout->addWidget( mMoveSpamRules ); + tqlayout->addWidget( mMoveSpamRules ); mFolderReqForSpamFolder = new FolderRequester( this, mainFolderTree ); mFolderReqForSpamFolder->setFolder( "trash" ); @@ -959,7 +959,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, mFolderReqForSpamFolder->setShowOutbox( false ); mFolderReqForSpamFolder->setShowImapFolders( false ); - TQHBoxLayout *hLayout1 = new TQHBoxLayout( layout ); + TQHBoxLayout *hLayout1 = new TQHBoxLayout( tqlayout ); hLayout1->addSpacing( KDialog::spacingHint() * 3 ); hLayout1->addWidget( mFolderReqForSpamFolder ); @@ -969,7 +969,7 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, "in the folder view below.<p>" "Not all tools support a classification as unsure. If you haven't " "selected a capable tool, you can't select a folder as well.") ); - layout->addWidget( mMoveUnsureRules ); + tqlayout->addWidget( mMoveUnsureRules ); mFolderReqForUnsureFolder = new FolderRequester( this, mainFolderTree ); mFolderReqForUnsureFolder->setFolder( "inbox" ); @@ -977,11 +977,11 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, mFolderReqForUnsureFolder->setShowOutbox( false ); mFolderReqForUnsureFolder->setShowImapFolders( false ); - TQHBoxLayout *hLayout2 = new TQHBoxLayout( layout ); + TQHBoxLayout *hLayout2 = new TQHBoxLayout( tqlayout ); hLayout2->addSpacing( KDialog::spacingHint() * 3 ); hLayout2->addWidget( mFolderReqForUnsureFolder ); - layout->addStretch(); + tqlayout->addStretch(); connect( mMarkRules, TQT_SIGNAL(clicked()), this, TQT_SLOT(processSelectionChange(void)) ); @@ -1138,11 +1138,11 @@ void ASWizVirusRulesPage::processSelectionChange() ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name ) : ASWizPage( parent, name ) { - TQBoxLayout * layout = new TQVBoxLayout( mLayout ); + TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); mSummaryText = new TQLabel( this ); - layout->addWidget( mSummaryText ); - layout->addStretch(); + tqlayout->addWidget( mSummaryText ); + tqlayout->addStretch(); } diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h index 23f215041..04ec41046 100644 --- a/kmail/antispamwizard.h +++ b/kmail/antispamwizard.h @@ -37,7 +37,7 @@ #include <tqcheckbox.h> #include <tqdict.h> -#include <layout.h> +#include <tqlayout.h> class KActionCollection; class KMFolder; diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index b8cdd3516..21c345fb3 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -33,7 +33,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> using namespace KMail; @@ -46,7 +46,7 @@ static TQString standardArchivePath( const TQString &folderName ) } return currentPath + i18n( "Start of the filename for a mail archive file" , "Archive" ) + "_" + folderName + - "_" + TQDate::currentDate().toString( Qt::ISODate ) + ".tar.bz2"; + "_" + TQDate::tqcurrentDate().toString( Qt::ISODate ) + ".tar.bz2"; } ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) @@ -120,7 +120,7 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mainLayout->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), row, 0 ); // Make it a bit bigger, else the folder requester cuts off the text too early - resize( 500, minimumSize().height() ); + resize( 500, tqminimumSize().height() ); } void ArchiveFolderDialog::slotUrlChanged( const TQString &text ) diff --git a/kmail/attachmentcollector.cpp b/kmail/attachmentcollector.cpp index b902f596f..688af6233 100644 --- a/kmail/attachmentcollector.cpp +++ b/kmail/attachmentcollector.cpp @@ -65,7 +65,7 @@ void KMail::AttachmentCollector::collectAttachmentsFrom( partNode * node ) { continue; } if ( isInSkipList( node ) ) { - node = node->next( false ); // skip even the children + node = node->next( false ); // skip even the tqchildren continue; } if ( isInExclusionList( node ) ) { diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp index a20e4118e..43209ca7b 100644 --- a/kmail/backupjob.cpp +++ b/kmail/backupjob.cpp @@ -148,7 +148,7 @@ void BackupJob::abort( const TQString &errorMessage ) // The progressmanager will delete it } - TQString text = i18n( "Failed to archive the folder '%1'." ).arg( mRootFolder->name() ); + TQString text = i18n( "Failed to archive the folder '%1'." ).tqarg( mRootFolder->name() ); text += "\n" + errorMessage; KMessageBox::sorry( mParentWidget, text, i18n( "Archiving failed." ) ); deleteLater(); @@ -165,19 +165,19 @@ void BackupJob::finish() } } - mProgressItem->seStatus( i18n( "Archiving finished" ) ); + mProgressItem->setqStatus( i18n( "Archiving finished" ) ); mProgressItem->setComplete(); mProgressItem = 0; TQFileInfo archiveFileInfo( mMailArchivePath.path() ); TQString text = i18n( "Archiving folder '%1' successfully completed. " "The archive was written to the file '%2'." ) - .arg( mRootFolder->name() ).arg( mMailArchivePath.path() ); + .tqarg( mRootFolder->name() ).tqarg( mMailArchivePath.path() ); text += "\n" + i18n( "1 message of size %1 was archived.", "%n messages with the total size of %1 were archived.", mArchivedMessages ) - .arg( KIO::convertSize( mArchivedSize ) ); + .tqarg( KIO::convertSize( mArchivedSize ) ); text += "\n" + i18n( "The archive file has a size of %1." ) - .arg( KIO::convertSize( archiveFileInfo.size() ) ); + .tqarg( KIO::convertSize( archiveFileInfo.size() ) ); KMessageBox::information( mParentWidget, text, i18n( "Archiving finished." ) ); if ( mDeleteFoldersAfterCompletion ) { @@ -213,7 +213,7 @@ void BackupJob::archiveNextMessage() KMMsgDict::instance()->getLocation( serNum, &folder, &mMessageIndex ); if ( mMessageIndex == -1 ) { kdWarning(5006) << "Failed to get message location for sernum " << serNum << endl; - abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to retrieve a message for folder '%1'." ).tqarg( mCurrentFolder->name() ) ); return; } @@ -223,7 +223,7 @@ void BackupJob::archiveNextMessage() KMMessage *message = mCurrentFolder->getMsg( mMessageIndex ); if ( !message ) { kdWarning(5006) << "Failed to retrieve message with index " << mMessageIndex << endl; - abort( i18n( "Unable to retrieve a message for folder '%1'." ).arg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to retrieve a message for folder '%1'." ).tqarg( mCurrentFolder->name() ) ); return; } @@ -249,7 +249,7 @@ void BackupJob::archiveNextMessage() kdWarning(5006) << "Message with subject " << mCurrentMessage->subject() << " is neither complete nor has a parent!" << endl; abort( i18n( "Internal error while trying to retrieve a message from folder '%1'." ) - .arg( mCurrentFolder->name() ) ); + .tqarg( mCurrentFolder->name() ) ); } mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) ); @@ -318,7 +318,7 @@ void BackupJob::processCurrentMessage() if ( !mArchive->writeFile( fileName, user, group, messageSize, permissions, accessTime, modificationTime, creationTime, messageString ) ) { - abort( i18n( "Failed to write a message into the archive folder '%1'." ).arg( mCurrentFolder->name() ) ); + abort( i18n( "Failed to write a message into the archive folder '%1'." ).tqarg( mCurrentFolder->name() ) ); return; } @@ -357,7 +357,7 @@ void BackupJob::folderJobFinished( KMail::FolderJob *job ) if ( job->error() ) { if ( mCurrentFolder ) - abort( i18n( "Downloading a message in folder '%1' failed." ).arg( mCurrentFolder->name() ) ); + abort( i18n( "Downloading a message in folder '%1' failed." ).tqarg( mCurrentFolder->name() ) ); else abort( i18n( "Downloading a message in the current folder failed." ) ); } @@ -388,9 +388,9 @@ void BackupJob::archiveNextFolder() mCurrentFolder = mPendingFolders.take( 0 ); kdDebug(5006) << "===> Archiving next folder: " << mCurrentFolder->name() << endl; - mProgressItem->seStatus( i18n( "Archiving folder %1" ).arg( mCurrentFolder->name() ) ); + mProgressItem->setqStatus( i18n( "Archiving folder %1" ).tqarg( mCurrentFolder->name() ) ); if ( mCurrentFolder->open( "BackupJob" ) != 0 ) { - abort( i18n( "Unable to open folder '%1'.").arg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to open folder '%1'.").tqarg( mCurrentFolder->name() ) ); return; } mCurrentFolderOpen = true; @@ -411,7 +411,7 @@ void BackupJob::archiveNextFolder() success = false; if ( !success ) { abort( i18n( "Unable to create folder structure for folder '%1' within archive file." ) - .arg( mCurrentFolder->name() ) ); + .tqarg( mCurrentFolder->name() ) ); return; } @@ -423,7 +423,7 @@ void BackupJob::archiveNextFolder() << " at index " << i << "!" << endl; // TODO: handle error in a nicer way. this is _very_ bad abort( i18n( "Unable to backup messages in folder '%1', the index file is corrupted." ) - .arg( mCurrentFolder->name() ) ); + .tqarg( mCurrentFolder->name() ) ); return; } else diff --git a/kmail/bodyvisitor.h b/kmail/bodyvisitor.h index a436fb443..1f236c4a7 100644 --- a/kmail/bodyvisitor.h +++ b/kmail/bodyvisitor.h @@ -60,7 +60,7 @@ namespace KMail { protected: /** - * Checks if one of the parents needs loaded children + * Checks if one of the parents needs loaded tqchildren * This is e.g. needed for multipart/signed where all parts have to be loaded */ static bool parentNeedsLoading( KMMessagePart * part ); diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index 4d35e308f..f47cc9ddf 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -234,7 +234,7 @@ void CachedImapJob::slotDeleteNextMessages( KIO::Job* job ) KURL url = mAccount->getUrl(); url.setPath( mFolder->imapPath() + - TQString::fromLatin1(";UID=%1").arg(uids) ); + TQString::tqfromLatin1(";UID=%1").tqarg(uids) ); KIO::SimpleJob *simpleJob = KIO::file_delete( url, false ); KIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob ); @@ -248,7 +248,7 @@ void CachedImapJob::expungeFolder() { KURL url = mAccount->getUrl(); // Special URL that means EXPUNGE - url.setPath( mFolder->imapPath() + TQString::fromLatin1(";UID=*") ); + url.setPath( mFolder->imapPath() + TQString::tqfromLatin1(";UID=*") ); KIO::SimpleJob *job = KIO::file_delete( url, false ); KIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); @@ -311,7 +311,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job) mFolder->addMsgInternal( mMsg, true, &index ); if ( kmkernel->iCalIface().isResourceFolder( mFolder->folder() ) ) { - mFolder->seStatus( index, KMMsgStatusRead, false ); + mFolder->setqStatus( index, KMMsgStatusRead, false ); } emit messageRetrieved( mMsg ); @@ -339,9 +339,9 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job) mMsg->setUID(mfd.uid); mMsg->setMsgSizeServer(mfd.size); if( mfd.flags > 0 ) - KMFolderImap::flagsToStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX); + KMFolderImap::flagsTotqStatus(mMsg, mfd.flags, true, GlobalSettings::allowLocalFlags() ? mFolder->permanentFlags() : INT_MAX); KURL url = mAccount->getUrl(); - url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").arg(mfd.uid)); + url.setPath(mFolder->imapPath() + TQString(";UID=%1;SECTION=BODY.PEEK[]").tqarg(mfd.uid)); ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); jd.cancellable = true; @@ -408,10 +408,10 @@ void CachedImapJob::slotPutNextMessage() unsigned int i = 0; for( char *ch = cstr.data(); *ch; ch++ ) { if ( *ch == '\n' ) { - mData.at(i) = '\r'; + mData.tqat(i) = '\r'; i++; } - mData.at(i) = *ch; i++; + mData.tqat(i) = *ch; i++; } jd.data = mData; jd.msgList.append( mMsg ); @@ -539,7 +539,7 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) if ( job->error() && !silentUpload ) { TQString myError = "<p><b>" + i18n("Error while uploading folder") - + "</b></p><p>" + i18n("Could not make the folder <b>%1</b> on the server.").arg((*it).items[0]) + + "</b></p><p>" + i18n("Could not make the folder <b>%1</b> on the server.").tqarg((*it).items[0]) + "</p><p>" + i18n("This could be because you do not have permission to do this, or because the folder is already present on the server; the error message from the server communication is here:") + "</p>"; mAccount->handleJobError( job, myError ); } @@ -597,8 +597,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) TQDataStream stream( packedArgs, IO_WriteOnly ); const TQString command = TQString( "X-CREATE-SPECIAL" ); - const TQString argument = TQString( "%1 %2" ).arg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) ) - .arg( path ); + const TQString argument = TQString( "%1 %2" ).tqarg( Scalix::Utils::contentsTypeToScalixId( folder->contentsType() ) ) + .tqarg( path ); stream << (int) 'X' << 'N' << command << argument; @@ -626,7 +626,7 @@ void CachedImapJob::slotDeleteNextFolder( KIO::Job *job ) mAccount->removeDeletedFolder( (*it).path ); if( job->error() ) { - mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).arg( (*it).path ) + '\n' ); + mAccount->handleJobError( job, i18n( "Error while deleting folder %1 on the server: " ).tqarg( (*it).path ) + '\n' ); delete this; return; } @@ -679,7 +679,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job) if( job->error() ) { mErrorCode = job->error(); - mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).arg( (*it).parent->label() ) + '\n' ); + mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).parent->label() ) + '\n' ); delete this; return; } @@ -813,7 +813,7 @@ void CachedImapJob::slotSubscribtionChange1Failed( const TQString &errorMessage "from the folder list after the next sync since it is unsubscribed on the server.\n" "You can try to manually subscribe to the folder yourself.\n\n" "%2" ) - .arg( mFolder->label() ).arg( errorMessage ) ); + .tqarg( mFolder->label() ).tqarg( errorMessage ) ); delete this; } @@ -854,7 +854,7 @@ void CachedImapJob::slotRenameFolderResult( KIO::Job *job ) if( job->error() ) { revertLabelChange(); - const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).arg( mFolder->label() ); + const TQString errorMessage = i18n( "Error while trying to rename folder %1" ).tqarg( mFolder->label() ); mAccount->handleJobError( job, errorMessage ); delete this; } else { diff --git a/kmail/callback.cpp b/kmail/callback.cpp index 7a7a583f2..0b94a5d1f 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -94,13 +94,13 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal, msg->setSubject( subject ); if ( GlobalSettings::self()->exchangeCompatibleInvitations() ) { if ( status == TQString("cancel") ) - msg->setSubject( i18n( "Declined: %1" ).arg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Declined: %1" ).tqarg(subject).replace("Answer: ","") ); else if ( status == TQString("tentative") ) - msg->setSubject( i18n( "Tentative: %1" ).arg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Tentative: %1" ).tqarg(subject).replace("Answer: ","") ); else if ( status == TQString("accepted") ) - msg->setSubject( i18n( "Accepted: %1" ).arg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Accepted: %1" ).tqarg(subject).replace("Answer: ","") ); else if ( status == TQString("delegated") ) - msg->setSubject( i18n( "Delegated: %1" ).arg(subject).replace("Answer: ","") ); + msg->setSubject( i18n( "Delegated: %1" ).tqarg(subject).replace("Answer: ","") ); } msg->setTo( to ); msg->setFrom( receiver() ); diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index fd2f42cb7..475ddd44f 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -4,7 +4,7 @@ #include <klistbox.h> #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& caption, @@ -14,26 +14,26 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt { TQWidget *page = makeMainWidget(); - TQVBoxLayout *layout = new TQVBoxLayout(page, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(page, KDialog::spacingHint()); mLabel = new TQLabel( i18n( "Please select the Chiasmus key file to use:" ), page ); - layout->addWidget( mLabel ); + tqlayout->addWidget( mLabel ); mListBox = new KListBox( page ); mListBox->insertStringList( keys ); const int current = keys.findIndex( currentKey ); mListBox->setSelected( TQMAX( 0, current ), true ); mListBox->ensureCurrentVisible(); - layout->addWidget( mListBox, 1 ); + tqlayout->addWidget( mListBox, 1 ); TQLabel* optionLabel = new TQLabel( i18n( "Additional arguments for chiasmus:" ), page ); - layout->addWidget( optionLabel ); + tqlayout->addWidget( optionLabel ); mOptions = new KLineEdit( lastOptions, page ); optionLabel->setBuddy( mOptions ); - layout->addWidget( mOptions ); + tqlayout->addWidget( mOptions ); - layout->addStretch(); + tqlayout->addStretch(); connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp index 741052c2d..35aa6ef3f 100644 --- a/kmail/compactionjob.cpp +++ b/kmail/compactionjob.cpp @@ -96,14 +96,14 @@ int MboxCompactionJob::executeNow( bool silent ) if (!storage->compactable()) { kdDebug(5006) << storage->location() << " compaction skipped." << endl; if ( !mSilent ) { - TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).arg( mbox->label() ); + TQString str = i18n( "For safety reasons, compaction has been disabled for %1" ).tqarg( mbox->label() ); BroadcastStatus::instance()->seStatusMsg( str ); } return 0; } kdDebug(5006) << "Compacting " << mSrcFolder->idString() << endl; - if (KMFolderIndex::IndexOk != mbox->indexStatus()) { + if (KMFolderIndex::IndexOk != mbox->indextqStatus()) { kdDebug(5006) << "Critical error: " << storage->location() << " has been modified by an external application while KMail was running." << endl; // exit(1); backed out due to broken nfs @@ -173,11 +173,11 @@ void MboxCompactionJob::done( int rc ) mbox->close("mboxcompact", true); mbox->setAutoCreateIndex( autoCreate ); mbox->setNeedsCompacting( false ); // We are clean now - str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() ); + str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() ); kdDebug(5006) << str << endl; } else { mbox->close("mboxcompact"); - str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() ); + str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() ); kdDebug(5006) << "Error occurred while compacting " << mbox->location() << endl; kdDebug(5006) << "Compaction aborted." << endl; TQFile::remove( mTempName ); @@ -256,9 +256,9 @@ void MaildirCompactionJob::done( int rc ) mCancellable = false; TQString str; if ( !rc ) { - str = i18n( "Folder \"%1\" successfully compacted" ).arg( mSrcFolder->label() ); + str = i18n( "Folder \"%1\" successfully compacted" ).tqarg( mSrcFolder->label() ); } else { - str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).arg( mSrcFolder->label() ); + str = i18n( "Error occurred while compacting \"%1\". Compaction aborted." ).tqarg( mSrcFolder->label() ); } mErrorCode = rc; storage->setNeedsCompacting( false ); diff --git a/kmail/composercryptoconfiguration.ui b/kmail/composercryptoconfiguration.ui index 429933d45..7ffe6c9d3 100644 --- a/kmail/composercryptoconfiguration.ui +++ b/kmail/composercryptoconfiguration.ui @@ -137,7 +137,7 @@ However, there may be local rules that require you to turn this option on. When <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 10653b8b4..59223cf89 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -110,11 +110,11 @@ using KMime::DateFormatter; #include <tqhbuttongroup.h> #include <tqtooltip.h> #include <tqlabel.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqheader.h> #include <tqpopupmenu.h> #include <tqradiobutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqwidgetstack.h> @@ -167,7 +167,7 @@ namespace { void populateButtonGroup( TQButtonGroup * g, const EnumConfigEntry & e ) { g->setTitle( i18n( e.desc ) ); - g->layout()->setSpacing( KDialog::spacingHint() ); + g->tqlayout()->setSpacing( KDialog::spacingHint() ); for ( int i = 0 ; i < e.numItems ; ++i ) g->insert( new TQRadioButton( i18n( e.items[i].desc ), g ), i ); } @@ -233,9 +233,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal // the KCMultiDialog starts with the size of the first kcm, not // the largest one. This way at least after the first showing of // the largest kcm the size is kept. - KConfigGroup geometry( KMKernel::config(), "Geometry" ); - int width = geometry.readNumEntry( "ConfigureDialogWidth" ); - int height = geometry.readNumEntry( "ConfigureDialogHeight" ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" ); + int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" ); if ( width != 0 && height != 0 ) { setMinimumSize( width, height ); } @@ -243,9 +243,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal } void ConfigureDialog::hideEvent( TQHideEvent *ev ) { - KConfigGroup geometry( KMKernel::config(), "Geometry" ); - geometry.writeEntry( "ConfigureDialogWidth", width() ); - geometry.writeEntry( "ConfigureDialogHeight",height() ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + tqgeometry.writeEntry( "ConfigureDialogWidth", width() ); + tqgeometry.writeEntry( "ConfigureDialogHeight",height() ); KDialogBase::hideEvent( ev ); } @@ -281,7 +281,7 @@ void ConfigureDialog::slotUser2() { // * * // ************************************************************* TQString IdentityPage::helpAnchor() const { - return TQString::fromLatin1("configure-identity"); + return TQString::tqfromLatin1("configure-identity"); } IdentityPage::IdentityPage( TQWidget * parent, const char * name ) @@ -451,7 +451,7 @@ void IdentityPage::slotRemoveIdentity() if ( !item ) return; TQString msg = i18n("<qt>Do you really want to remove the identity named " - "<b>%1</b>?</qt>").arg( item->identity().identityName() ); + "<b>%1</b>?</qt>").tqarg( item->identity().identityName() ); if( KMessageBox::warningContinueCancel( this, msg, i18n("Remove Identity"), KGuiItem(i18n("&Remove"),"editdelete") ) == KMessageBox::Continue ) if ( im->removeIdentity( item->identity().identityName() ) ) { @@ -552,7 +552,7 @@ void IdentityPage::slotUpdateTransportCombo( const TQStringList & sl ) // * * // ************************************************************* TQString AccountsPage::helpAnchor() const { - return TQString::fromLatin1("configure-accounts"); + return TQString::tqfromLatin1("configure-accounts"); } AccountsPage::AccountsPage( TQWidget * parent, const char * name ) @@ -578,7 +578,7 @@ AccountsPage::AccountsPage( TQWidget * parent, const char * name ) } TQString AccountsPage::SendingTab::helpAnchor() const { - return TQString::fromLatin1("configure-accounts-sending"); + return TQString::tqfromLatin1("configure-accounts-sending"); } AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * name ) @@ -597,9 +597,9 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // label: zero stretch ### FIXME more vlay->addWidget( new TQLabel( i18n("Outgoing accounts (add at least one):"), this ) ); - // hbox layout: stretch 10, spacing inherited from vlay + // hbox tqlayout: stretch 10, spacing inherited from vlay hlay = new TQHBoxLayout(); - vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's sizeHint + vlay->addLayout( hlay, 10 ); // high stretch b/c of the groupbox's tqsizeHint // transport list: left widget in hlay; stretch 1 // ### FIXME: allow inline renaming of the account: @@ -614,7 +614,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * this, TQT_SLOT(slotModifySelectedTransport()) ); hlay->addWidget( mTransportList, 1 ); - // a vbox layout for the buttons: zero stretch, spacing inherited from hlay + // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay btn_vlay = new TQVBoxLayout( hlay ); // "add..." button: stretch 0 @@ -653,8 +653,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * i18n("Common Options"), this ); vlay->addWidget(group); - // a grid layout for the contents of the "common options" group box - glay = new TQGridLayout( group->layout(), 5, 3, KDialog::spacingHint() ); + // a grid tqlayout for the contents of the "common options" group box + glay = new TQGridLayout( group->tqlayout(), 5, 3, KDialog::spacingHint() ); glay->setColStretch( 2, 10 ); // "confirm before send" check box: @@ -742,7 +742,7 @@ static inline TQString uniqueName( const TQStringList & list, while ( list.find( result ) != list.end() ) { result = i18n("%1: name; %2: number appended to it to make it unique " "among a list of names", "%1 %2") - .arg( name ).arg( suffix ); + .tqarg( name ).tqarg( suffix ); suffix++; } return result; @@ -787,10 +787,10 @@ void AccountsPage::SendingTab::slotAddTransport() KMTransportInfo *transportInfo = new KMTransportInfo(); switch ( transportType ) { case 0: // smtp - transportInfo->type = TQString::fromLatin1("smtp"); + transportInfo->type = TQString::tqfromLatin1("smtp"); break; case 1: // sendmail - transportInfo->type = TQString::fromLatin1("sendmail"); + transportInfo->type = TQString::tqfromLatin1("sendmail"); transportInfo->name = i18n("Sendmail"); transportInfo->host = _PATH_SENDMAIL; // ### FIXME: use const, not #define break; @@ -830,7 +830,7 @@ void AccountsPage::SendingTab::slotAddTransport() "Configure->Accounts->Sending listview, \"type\" " "column, first row, to indicate that this is the " "default transport", "%1 (Default)") - .arg( transportInfo->type ); + .tqarg( transportInfo->type ); GlobalSettings::self()->setDefaultTransport( transportInfo->name ); } (void) new TQListViewItem( mTransportList, lastItem, transportInfo->name, @@ -1026,7 +1026,7 @@ void AccountsPage::SendingTab::doLoadOther() { buffer[255] = 0; else buffer[0] = 0; - str = TQString::fromLatin1( *buffer ? buffer : "localhost" ); + str = TQString::tqfromLatin1( *buffer ? buffer : "localhost" ); } mDefaultDomainEdit->setText( str ); } @@ -1053,7 +1053,7 @@ void AccountsPage::SendingTab::save() { } TQString AccountsPage::ReceivingTab::helpAnchor() const { - return TQString::fromLatin1("configure-accounts-receiving"); + return TQString::tqfromLatin1("configure-accounts-receiving"); } AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const char * name ) @@ -1071,7 +1071,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // label: zero stretch vlay->addWidget( new TQLabel( i18n("Incoming accounts (add at least one):"), this ) ); - // hbox layout: stretch 10, spacing inherited from vlay + // hbox tqlayout: stretch 10, spacing inherited from vlay hlay = new TQHBoxLayout(); vlay->addLayout( hlay, 10 ); // high stretch to suppress groupbox's growing @@ -1088,7 +1088,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha this, TQT_SLOT(slotModifySelectedAccount()) ); hlay->addWidget( mAccountList, 1 ); - // a vbox layout for the buttons: zero stretch, spacing inherited from hlay + // a vbox tqlayout for the buttons: zero stretch, spacing inherited from hlay btn_vlay = new TQVBoxLayout( hlay ); // "add..." button: stretch 0 @@ -1123,11 +1123,11 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "New Mail Notification" group box: stretch 0 group = new TQVGroupBox( i18n("New Mail Notification"), this ); vlay->addWidget( group ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); // "beep on new mail" check box: mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group ); - mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + mBeepNewMailCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); connect( mBeepNewMailCheck, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); @@ -1135,7 +1135,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "Detailed new mail notification" check box mVerboseNotificationCheck = new TQCheckBox( i18n( "Deta&iled new mail notification" ), group ); - mVerboseNotificationCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + mVerboseNotificationCheck->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); TQToolTip::add( mVerboseNotificationCheck, i18n( "Show for each folder the number of newly arrived " @@ -1147,7 +1147,7 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "Other Actions" button: mOtherNewMailActionsButton = new TQPushButton( i18n("Other Actio&ns"), group ); - mOtherNewMailActionsButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + mOtherNewMailActionsButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditNotifications()) ); @@ -1229,7 +1229,7 @@ void AccountsPage::ReceivingTab::slotAddAccount() { } KMAccount *account - = kmkernel->acctMgr()->create( TQString::fromLatin1( accountType ) ); + = kmkernel->acctMgr()->create( TQString::tqfromLatin1( accountType ) ); if ( !account ) { // ### FIXME: Give the user more information. Is this error // recoverable? @@ -1364,7 +1364,7 @@ void AccountsPage::ReceivingTab::slotRemoveSelectedAccount() { if ( !acct ) { // ### FIXME: see above KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>") - .arg(listItem->text(0)) ); + .tqarg(listItem->text(0)) ); return; } @@ -1444,7 +1444,7 @@ void AccountsPage::ReceivingTab::save() { kmkernel->acctMgr()->writeConfig( true ); if ( (*it) && !kmkernel->acctMgr()->remove(*it) ) KMessageBox::sorry( this, i18n("<qt>Unable to locate account <b>%1</b>.</qt>") - .arg( (*it)->name() ) ); + .tqarg( (*it)->name() ) ); } mAccountsToDelete.clear(); @@ -1478,7 +1478,7 @@ void AccountsPage::ReceivingTab::save() { // * * // ************************************************************* TQString AppearancePage::helpAnchor() const { - return TQString::fromLatin1("configure-appearance"); + return TQString::tqfromLatin1("configure-appearance"); } AppearancePage::AppearancePage( TQWidget * parent, const char * name ) @@ -1525,7 +1525,7 @@ AppearancePage::AppearancePage( TQWidget * parent, const char * name ) TQString AppearancePage::FontsTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-fonts"); + return TQString::tqfromLatin1("configure-appearance-fonts"); } static const struct { @@ -1694,7 +1694,7 @@ void AppearancePage::FontsTab::save() { } TQString AppearancePage::ColorsTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-colors"); + return TQString::tqfromLatin1("configure-appearance-colors"); } @@ -1793,9 +1793,9 @@ void AppearancePage::ColorsTab::doLoadOther() { mCloseToQuotaThreshold->setValue( GlobalSettings::closeToQuotaThreshold() ); static const TQColor defaultColor[ numColorNames ] = { - kapp->palette().active().base(), // bg + kapp->tqpalette().active().base(), // bg KGlobalSettings::alternateBackgroundColor(), // alt bg - kapp->palette().active().text(), // fg + kapp->tqpalette().active().text(), // fg TQColor( 0x00, 0x80, 0x00 ), // quoted l1 TQColor( 0x00, 0x70, 0x00 ), // quoted l2 TQColor( 0x00, 0x60, 0x00 ), // quoted l3 @@ -1857,7 +1857,7 @@ void AppearancePage::ColorsTab::save() { } TQString AppearancePage::LayoutTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-layout"); + return TQString::tqfromLatin1("configure-appearance-tqlayout"); } static const EnumConfigEntryItem folderListModes[] = { @@ -1941,33 +1941,33 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char void AppearancePage::LayoutTab::doLoadOther() { const KConfigGroup reader( KMKernel::config(), "Reader" ); - const KConfigGroup geometry( KMKernel::config(), "Geometry" ); + const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - loadWidget( mFolderListGroup, geometry, folderListMode ); + loadWidget( mFolderListGroup, tqgeometry, folderListMode ); loadWidget( mMIMETreeLocationGroup, reader, mimeTreeLocation ); loadWidget( mMIMETreeModeGroup, reader, mimeTreeMode ); - loadWidget( mReaderWindowModeGroup, geometry, readerWindowMode ); + loadWidget( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); mFavoriteFolderViewCB->setChecked( GlobalSettings::self()->enableFavoriteFolderView() ); } void AppearancePage::LayoutTab::installProfile( KConfig * profile ) { const KConfigGroup reader( profile, "Reader" ); - const KConfigGroup geometry( profile, "Geometry" ); + const KConfigGroup tqgeometry( profile, "Geometry" ); - loadProfile( mFolderListGroup, geometry, folderListMode ); + loadProfile( mFolderListGroup, tqgeometry, folderListMode ); loadProfile( mMIMETreeLocationGroup, reader, mimeTreeLocation ); loadProfile( mMIMETreeModeGroup, reader, mimeTreeMode ); - loadProfile( mReaderWindowModeGroup, geometry, readerWindowMode ); + loadProfile( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); } void AppearancePage::LayoutTab::save() { KConfigGroup reader( KMKernel::config(), "Reader" ); - KConfigGroup geometry( KMKernel::config(), "Geometry" ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - saveButtonGroup( mFolderListGroup, geometry, folderListMode ); + saveButtonGroup( mFolderListGroup, tqgeometry, folderListMode ); saveButtonGroup( mMIMETreeLocationGroup, reader, mimeTreeLocation ); saveButtonGroup( mMIMETreeModeGroup, reader, mimeTreeMode ); - saveButtonGroup( mReaderWindowModeGroup, geometry, readerWindowMode ); + saveButtonGroup( mReaderWindowModeGroup, tqgeometry, readerWindowMode ); GlobalSettings::self()->setEnableFavoriteFolderView( mFavoriteFolderViewCB->isChecked() ); } @@ -1976,7 +1976,7 @@ void AppearancePage::LayoutTab::save() { // TQString AppearancePage::HeadersTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-headers"); + return TQString::tqfromLatin1("configure-appearance-headers"); } static const struct { @@ -2004,7 +2004,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "General Options" group: group = new TQVButtonGroup( i18n( "General Options" ), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); mMessageSizeCheck = new TQCheckBox( i18n("Display messa&ge sizes"), group ); @@ -2030,7 +2030,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "Message Header Threading Options" group: mNestingPolicy = new TQVButtonGroup( i18n("Threaded Message List Options"), this ); - mNestingPolicy->layout()->setSpacing( KDialog::spacingHint() ); + mNestingPolicy->tqlayout()->setSpacing( KDialog::spacingHint() ); mNestingPolicy->insert( new TQRadioButton( i18n("Always &keep threads open"), @@ -2053,12 +2053,12 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha // "Date Display" group: mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this ); - mDateDisplay->layout()->setSpacing( KDialog::spacingHint() ); + mDateDisplay->tqlayout()->setSpacing( KDialog::spacingHint() ); for ( int i = 0 ; i < numDateDisplayConfig ; i++ ) { TQString buttonLabel = i18n(dateDisplayConfig[i].displayName); if ( buttonLabel.contains("%1") ) - buttonLabel = buttonLabel.arg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) ); + buttonLabel = buttonLabel.tqarg( DateFormatter::formatCurrentDate( dateDisplayConfig[i].dateDisplay ) ); radio = new TQRadioButton( buttonLabel, mDateDisplay ); mDateDisplay->insert( radio, i ); if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) { @@ -2115,16 +2115,16 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha void AppearancePage::HeadersTab::doLoadOther() { KConfigGroup general( KMKernel::config(), "General" ); - KConfigGroup geometry( KMKernel::config(), "Geometry" ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); // "General Options": - mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages", false ) ); + mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages", false ) ); mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize", false ) ); mCryptoIconsCheck->setChecked( general.readBoolEntry( "showCryptoIcons", false ) ); mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon", true ) ); // "Message Header Threading Options": - int num = geometry.readNumEntry( "nestingPolicy", 3 ); + int num = tqgeometry.readNumEntry( "nestingPolicy", 3 ); if ( num < 0 || num > 3 ) num = 3; mNestingPolicy->setButton( num ); @@ -2152,10 +2152,10 @@ void AppearancePage::HeadersTab::setDateDisplay( int num, const TQString & forma void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { KConfigGroup general( profile, "General" ); - KConfigGroup geometry( profile, "Geometry" ); + KConfigGroup tqgeometry( profile, "Geometry" ); - if ( geometry.hasKey( "nestedMessages" ) ) - mNestedMessagesCheck->setChecked( geometry.readBoolEntry( "nestedMessages" ) ); + if ( tqgeometry.hasKey( "nestedMessages" ) ) + mNestedMessagesCheck->setChecked( tqgeometry.readBoolEntry( "nestedMessages" ) ); if ( general.hasKey( "showMessageSize" ) ) mMessageSizeCheck->setChecked( general.readBoolEntry( "showMessageSize" ) ); @@ -2164,8 +2164,8 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { if ( general.hasKey( "showAttachmentIcon" ) ) mAttachmentCheck->setChecked( general.readBoolEntry( "showAttachmentIcon" ) ); - if ( geometry.hasKey( "nestingPolicy" ) ) { - int num = geometry.readNumEntry( "nestingPolicy" ); + if ( tqgeometry.hasKey( "nestingPolicy" ) ) { + int num = tqgeometry.readNumEntry( "nestingPolicy" ); if ( num < 0 || num > 3 ) num = 3; mNestingPolicy->setButton( num ); } @@ -2177,16 +2177,16 @@ void AppearancePage::HeadersTab::installProfile( KConfig * profile ) { void AppearancePage::HeadersTab::save() { KConfigGroup general( KMKernel::config(), "General" ); - KConfigGroup geometry( KMKernel::config(), "Geometry" ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); - if ( geometry.readBoolEntry( "nestedMessages", false ) + if ( tqgeometry.readBoolEntry( "nestedMessages", false ) != mNestedMessagesCheck->isChecked() ) { int result = KMessageBox::warningContinueCancel( this, i18n("Changing the global threading setting will override " "all folder specific values."), TQString(), KStdGuiItem::cont(), "threadOverride" ); if ( result == KMessageBox::Continue ) { - geometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() ); + tqgeometry.writeEntry( "nestedMessages", mNestedMessagesCheck->isChecked() ); // remove all threadMessagesOverride keys from all [Folder-*] groups: TQStringList groups = KMKernel::config()->groupList().grep( TQRegExp("^Folder-") ); kdDebug(5006) << "groups.count() == " << groups.count() << endl; @@ -2197,7 +2197,7 @@ void AppearancePage::HeadersTab::save() { } } - geometry.writeEntry( "nestingPolicy", + tqgeometry.writeEntry( "nestingPolicy", mNestingPolicy->id( mNestingPolicy->selected() ) ); general.writeEntry( "showMessageSize", mMessageSizeCheck->isChecked() ); general.writeEntry( "showCryptoIcons", mCryptoIconsCheck->isChecked() ); @@ -2246,7 +2246,7 @@ static const BoolConfigEntry showCurrentTime = { }; TQString AppearancePage::ReaderTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-reader"); + return TQString::tqfromLatin1("configure-appearance-reader"); } AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, @@ -2472,7 +2472,7 @@ void AppearancePage::ReaderTab::installProfile( KConfig * /* profile */ ) { TQString AppearancePage::SystemTrayTab::helpAnchor() const { - return TQString::fromLatin1("configure-appearance-systemtray"); + return TQString::tqfromLatin1("configure-appearance-systemtray"); } AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, @@ -2490,7 +2490,7 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, // System tray modes mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this ); - mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() ); + mSystemTrayGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); vlay->addWidget( mSystemTrayGroup ); connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); @@ -2537,7 +2537,7 @@ void AppearancePage::SystemTrayTab::save() { // ************************************************************* TQString ComposerPage::helpAnchor() const { - return TQString::fromLatin1("configure-composer"); + return TQString::tqfromLatin1("configure-composer"); } ComposerPage::ComposerPage( TQWidget * parent, const char * name ) @@ -2596,7 +2596,7 @@ ComposerPage::ComposerPage( TQWidget * parent, const char * name ) } TQString ComposerPage::GeneralTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-general"); + return TQString::tqfromLatin1("configure-composer-general"); } ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * name ) @@ -2766,7 +2766,7 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * // The "external editor" group: group = new TQVGroupBox( i18n("External Editor"), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); mExternalEditorCheck = new TQCheckBox( GlobalSettings::self()->useExternalEditorItem()->label(), @@ -2910,7 +2910,7 @@ void ComposerPage::GeneralTab::slotConfigureCompletionOrder( ) } TQString ComposerPage::PhrasesTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-phrases"); + return TQString::tqfromLatin1("configure-composer-phrases"); } ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * name ) @@ -3122,7 +3122,7 @@ void ComposerPage::PhrasesTab::save() { } TQString ComposerPage::TemplatesTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-templates"); + return TQString::tqfromLatin1("configure-composer-templates"); } ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const char * name ) @@ -3146,7 +3146,7 @@ void ComposerPage::TemplatesTab::save() { } TQString ComposerPage::CustomTemplatesTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-custom-templates"); + return TQString::tqfromLatin1("configure-composer-custom-templates"); } ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * parent, const char * name ) @@ -3170,7 +3170,7 @@ void ComposerPage::CustomTemplatesTab::save() { } TQString ComposerPage::SubjectTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-subject"); + return TQString::tqfromLatin1("configure-composer-subject"); } ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * name ) @@ -3185,12 +3185,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); group = new TQVGroupBox( i18n("Repl&y Subject Prefixes"), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); // row 0: help text: label = new TQLabel( i18n("Recognize any sequence of the following prefixes\n" "(entries are case-insensitive regular expressions):"), group ); - label->setAlignment( AlignLeft|WordBreak ); + label->tqsetAlignment( AlignLeft|WordBreak ); // row 1, string list editor: SimpleStringListEditor::ButtonCode buttonCode = @@ -3214,12 +3214,12 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * group = new TQVGroupBox( i18n("For&ward Subject Prefixes"), this ); - group->layout()->setSpacing( KDialog::marginHint() ); + group->tqlayout()->setSpacing( KDialog::marginHint() ); // row 0: help text: label= new TQLabel( i18n("Recognize any sequence of the following prefixes\n" "(entries are case-insensitive regular expressions):"), group ); - label->setAlignment( AlignLeft|WordBreak ); + label->tqsetAlignment( AlignLeft|WordBreak ); // row 1: string list editor mForwardListEditor = @@ -3254,7 +3254,7 @@ void ComposerPage::SubjectTab::save() { } TQString ComposerPage::CharsetTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-charset"); + return TQString::tqfromLatin1("configure-composer-charset"); } ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * name ) @@ -3269,7 +3269,7 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * label = new TQLabel( i18n("This list is checked for every outgoing message " "from the top to the bottom for a charset that " "contains all required characters."), this ); - label->setAlignment( WordBreak); + label->tqsetAlignment( WordBreak); vlay->addWidget( label ); mCharsetListEditor = @@ -3297,21 +3297,21 @@ void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { // KCharsets::codecForName("us-ascii") returns "iso-8859-1" (cf. Bug #49812) // therefore we have to treat this case specially - if ( charset.lower() == TQString::fromLatin1("us-ascii") ) { - charset = TQString::fromLatin1("us-ascii"); + if ( charset.lower() == TQString::tqfromLatin1("us-ascii") ) { + charset = TQString::tqfromLatin1("us-ascii"); return; } - if ( charset.lower() == TQString::fromLatin1("locale") ) { - charset = TQString::fromLatin1("%1 (locale)") - .arg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); + if ( charset.lower() == TQString::tqfromLatin1("locale") ) { + charset = TQString::tqfromLatin1("%1 (locale)") + .tqarg( TQString( kmkernel->networkCodec()->mimeName() ).lower() ); return; } bool ok = false; TQTextCodec *codec = KGlobal::charsets()->codecForName( charset, ok ); if ( ok && codec ) { - charset = TQString::fromLatin1( codec->mimeName() ).lower(); + charset = TQString::tqfromLatin1( codec->mimeName() ).lower(); return; } @@ -3325,10 +3325,10 @@ void ComposerPage::CharsetTab::doLoadOther() { TQStringList charsets = composer.readListEntry( "pref-charsets" ); for ( TQStringList::Iterator it = charsets.begin() ; it != charsets.end() ; ++it ) - if ( (*it) == TQString::fromLatin1("locale") ) { + if ( (*it) == TQString::tqfromLatin1("locale") ) { TQCString cset = kmkernel->networkCodec()->mimeName(); KPIM::kAsciiToLower( cset.data() ); - (*it) = TQString("%1 (locale)").arg( TQString(cset) ); + (*it) = TQString("%1 (locale)").tqarg( TQString(cset) ); } mCharsetListEditor->setStringList( charsets ); @@ -3349,7 +3349,7 @@ void ComposerPage::CharsetTab::save() { } TQString ComposerPage::HeadersTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-headers"); + return TQString::tqfromLatin1("configure-composer-headers"); } ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * name ) @@ -3564,7 +3564,7 @@ void ComposerPage::HeadersTab::save() { } TQString ComposerPage::AttachmentsTab::helpAnchor() const { - return TQString::fromLatin1("configure-composer-attachments"); + return TQString::tqfromLatin1("configure-composer-attachments"); } ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, @@ -3601,7 +3601,7 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, // "Attachment key words" label and string list editor label = new TQLabel( i18n("Recognize any of the following key words as " "intention to attach a file:"), this ); - label->setAlignment( AlignLeft|WordBreak ); + label->tqsetAlignment( AlignLeft|WordBreak ); vlay->addWidget( label ); SimpleStringListEditor::ButtonCode buttonCode = @@ -3629,11 +3629,11 @@ void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() { TQStringList attachWordsList = GlobalSettings::self()->attachmentKeywords(); if ( attachWordsList.isEmpty() ) { // default value - attachWordsList << TQString::fromLatin1("attachment") - << TQString::fromLatin1("attached"); - if ( TQString::fromLatin1("attachment") != i18n("attachment") ) + attachWordsList << TQString::tqfromLatin1("attachment") + << TQString::tqfromLatin1("attached"); + if ( TQString::tqfromLatin1("attachment") != i18n("attachment") ) attachWordsList << i18n("attachment"); - if ( TQString::fromLatin1("attached") != i18n("attached") ) + if ( TQString::tqfromLatin1("attached") != i18n("attached") ) attachWordsList << i18n("attached"); } @@ -3669,7 +3669,7 @@ void ComposerPageAttachmentsTab::slotOutlookCompatibleClicked() // * * // ************************************************************* TQString SecurityPage::helpAnchor() const { - return TQString::fromLatin1("configure-security"); + return TQString::tqfromLatin1("configure-security"); } SecurityPage::SecurityPage( TQWidget * parent, const char * name ) @@ -3716,7 +3716,7 @@ void SecurityPage::installProfile( KConfig * profile ) { } TQString SecurityPage::GeneralTab::helpAnchor() const { - return TQString::fromLatin1("configure-security-reading"); + return TQString::tqfromLatin1("configure-security-reading"); } SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * name ) @@ -3798,7 +3798,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "HTML Messages" group box: group = new TQVGroupBox( i18n( "HTML Messages" ), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group ); TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis ); @@ -3815,21 +3815,21 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * "exploits. <a href=\"whatsthis:%1\">More about " "HTML mails...</a> <a href=\"whatsthis:%2\">More " "about external references...</a>") - .arg(htmlWhatsThis).arg(externalWhatsThis), + .tqarg(htmlWhatsThis).tqarg(externalWhatsThis), group ); vlay->addWidget( group ); // encrypted messages group group = new TQVGroupBox( i18n("Encrypted Messages"), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group ); connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) ); vlay->addWidget( group ); // "Message Disposition Notification" groupbox: group = new TQVGroupBox( i18n("Message Disposition Notifications"), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); // "ignore", "ask", "deny", "always send" radiobutton line: @@ -3890,14 +3890,14 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * label = new KActiveLabel( i18n("<b>WARNING:</b> Unconditionally returning " "confirmations undermines your privacy. " "<a href=\"whatsthis:%1\">More...</a>") - .arg(receiptWhatsThis), + .tqarg(receiptWhatsThis), group ); vlay->addWidget( group ); // "Attached keys" group box: group = new TQVGroupBox( i18n( "Certificate && Key Bundle Attachments" ), this ); - group->layout()->setSpacing( KDialog::spacingHint() ); + group->tqlayout()->setSpacing( KDialog::spacingHint() ); mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group ); connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); @@ -3993,7 +3993,7 @@ void SecurityPage::GeneralTab::save() { TQString SecurityPage::ComposerCryptoTab::helpAnchor() const { - return TQString::fromLatin1("configure-security-composing"); + return TQString::tqfromLatin1("configure-security-composing"); } SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, const char * name ) @@ -4068,7 +4068,7 @@ void SecurityPage::ComposerCryptoTab::save() { } TQString SecurityPage::WarningTab::helpAnchor() const { - return TQString::fromLatin1("configure-security-warnings"); + return TQString::tqfromLatin1("configure-security-warnings"); } SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * name ) @@ -4177,7 +4177,7 @@ void SecurityPage::WarningTab::slotReenableAllWarningsClicked() { //// TQString SecurityPage::SMimeTab::helpAnchor() const { - return TQString::fromLatin1("configure-security-smime-validation"); + return TQString::tqfromLatin1("configure-security-smime-validation"); } SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name ) @@ -4358,7 +4358,7 @@ void SecurityPage::SMimeTab::doLoadOther() { TQString systemProxy = TQString::fromLocal8Bit( getenv( "http_proxy" ) ); if ( systemProxy.isEmpty() ) systemProxy = i18n( "no proxy" ); - mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).arg( systemProxy ) ); + mWidget->systemHTTPProxy->setText( i18n( "(Current system setting: %1)" ).tqarg( systemProxy ) ); bool honor = e.mHonorHTTPProxy && e.mHonorHTTPProxy->boolValue(); mWidget->honorHTTPProxyRB->setChecked( honor ); mWidget->useCustomHTTPProxyRB->setChecked( !honor ); @@ -4482,11 +4482,11 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp { Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName ); if ( !entry ) { - kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) << endl; + kdWarning(5006) << TQString( "Backend error: gpgconf doesn't seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) << endl; return 0; } if( entry->argType() != argType || entry->isList() != isList ) { - kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) << endl; + kdWarning(5006) << TQString( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) << endl; return 0; } return entry; @@ -4495,7 +4495,7 @@ Kleo::CryptoConfigEntry* SMIMECryptoConfigEntries::configEntry( const char* comp //// TQString SecurityPage::CryptPlugTab::helpAnchor() const { - return TQString::fromLatin1("configure-security-crypto-backends"); + return TQString::tqfromLatin1("configure-security-crypto-backends"); } SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const char * name ) @@ -4528,7 +4528,7 @@ void SecurityPage::CryptPlugTab::save() { // * * // ************************************************************* TQString MiscPage::helpAnchor() const { - return TQString::fromLatin1("configure-misc"); + return TQString::tqfromLatin1("configure-misc"); } MiscPage::MiscPage( TQWidget * parent, const char * name ) @@ -4543,7 +4543,7 @@ MiscPage::MiscPage( TQWidget * parent, const char * name ) } TQString MiscPage::FolderTab::helpAnchor() const { - return TQString::fromLatin1("configure-misc-folders"); + return TQString::tqfromLatin1("configure-misc-folders"); } MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) @@ -4797,7 +4797,7 @@ void MiscPage::FolderTab::save() { } TQString MiscPage::GroupwareTab::helpAnchor() const { - return TQString::fromLatin1("configure-misc-groupware"); + return TQString::tqfromLatin1("configure-misc-groupware"); } MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) @@ -5135,7 +5135,7 @@ void MiscPage::GroupwareTab::save() { // Inbox folder of the selected account KMAccount* acct = mAccountCombo->currentAccount(); if ( acct ) { - folderId = TQString( ".%1.directory/INBOX" ).arg( acct->id() ); + folderId = TQString( ".%1.directory/INBOX" ).tqarg( acct->id() ); GlobalSettings::self()->setTheIMAPResourceAccount( acct->id() ); } } diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 7609be3c8..6357e1e86 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -31,7 +31,7 @@ #include <tqradiobutton.h> #include <tqbuttongroup.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> // Other headers: #include <assert.h> @@ -43,7 +43,7 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, : KDialogBase( parent, name, modal, i18n("New Identity"), Ok|Cancel|Help, Ok, true ) { - setHelp( TQString::fromLatin1("configure-identity-newidentitydialog") ); + setHelp( TQString::tqfromLatin1("configure-identity-newidentitydialog") ); TQWidget * page = makeMainWidget(); TQVBoxLayout * vlay = new TQVBoxLayout( page, 0, spacingHint() ); @@ -169,33 +169,33 @@ void ListView::setVisibleItem( int visibleItem, bool updateSize ) mVisibleItem = TQMAX( 1, visibleItem ); if( updateSize == true ) { - TQSize s = sizeHint(); - setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() + + TQSize s = tqsizeHint(); + setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() + lineWidth() * 2, s.height() ); } } -TQSize ListView::sizeHint() const +TQSize ListView::tqsizeHint() const { - TQSize s = TQListView::sizeHint(); + TQSize s = TQListView::tqsizeHint(); int h = fontMetrics().height() + 2*itemMargin(); if( h % 2 > 0 ) { h++; } - s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height()); + s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height()); return s; } -static TQString flagPng = TQString::fromLatin1("/flag.png"); +static TQString flagPng = TQString::tqfromLatin1("/flag.png"); NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent, const char *name, bool modal ) : KDialogBase( parent, name, modal, i18n("New Language"), Ok|Cancel, Ok, true ) { - // layout the page (a combobox with label): + // tqlayout the page (a combobox with label): TQWidget *page = makeMainWidget(); TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() ); mComboBox = new TQComboBox( false, page ); @@ -203,7 +203,7 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, hlay->addWidget( mComboBox, 1 ); TQStringList pathList = KGlobal::dirs()->findAllResources( "locale", - TQString::fromLatin1("*/entry.desktop") ); + TQString::tqfromLatin1("*/entry.desktop") ); // extract a list of language tags that should not be included: TQStringList suppressedAcronyms; for ( LanguageItemList::Iterator lit = suppressedLangs.begin(); @@ -224,8 +224,8 @@ NewLanguageDialog::NewLanguageDialog( LanguageItemList & suppressedLangs, if ( suppressedAcronyms.find( acronym ) == suppressedAcronyms.end() ) { // not found: - TQString displayname = TQString::fromLatin1("%1 (%2)") - .arg( name ).arg( acronym ); + TQString displayname = TQString::tqfromLatin1("%1 (%2)") + .tqarg( name ).tqarg( acronym ); TQPixmap flag( locate("locale", acronym + flagPng ) ); mComboBox->insertItem( flag, displayname ); } @@ -251,11 +251,11 @@ LanguageComboBox::LanguageComboBox( bool rw, TQWidget *parent, const char *name int LanguageComboBox::insertLanguage( const TQString & language ) { - static TQString entryDesktop = TQString::fromLatin1("/entry.desktop"); + static TQString entryDesktop = TQString::tqfromLatin1("/entry.desktop"); KSimpleConfig entry( locate("locale", language + entryDesktop) ); entry.setGroup( "KCM Locale" ); TQString name = entry.readEntry( "Name" ); - TQString output = TQString::fromLatin1("%1 (%2)").arg( name ).arg( language ); + TQString output = TQString::tqfromLatin1("%1 (%2)").tqarg( name ).tqarg( language ); insertItem( TQPixmap( locate("locale", language + flagPng ) ), output ); return listBox()->index( listBox()->findItem(output) ); } @@ -269,7 +269,7 @@ TQString LanguageComboBox::language() const void LanguageComboBox::setLanguage( const TQString & language ) { - TQString parenthizedLanguage = TQString::fromLatin1("(%1)").arg( language ); + TQString parenthizedLanguage = TQString::tqfromLatin1("(%1)").tqarg( language ); for (int i = 0; i < count(); i++) // ### FIXME: use .endWith(): if ( text(i).find( parenthizedLanguage ) >= 0 ) { @@ -323,7 +323,7 @@ void ProfileDialog::slotSelectionChanged() void ProfileDialog::setup() { mListView->clear(); // find all profiles (config files named "profile-xyz-rc"): - const TQString profileFilenameFilter = TQString::fromLatin1("kmail/profile-*-rc"); + const TQString profileFilenameFilter = TQString::tqfromLatin1("kmail/profile-*-rc"); mProfileList = KGlobal::dirs()->findAllResources( "data", profileFilenameFilter ); kdDebug(5006) << "Profile manager: found " << mProfileList.count() diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index 51dca5e16..e095b1756 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -1094,7 +1094,7 @@ public: void resizeColums(); void setVisibleItem( int visibleItem, bool updateSize=true ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; protected: virtual void resizeEvent( TQResizeEvent *e ); diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp index a83b1cd6c..9be07213e 100644 --- a/kmail/copyfolderjob.cpp +++ b/kmail/copyfolderjob.cpp @@ -67,7 +67,7 @@ CopyFolderJob::~CopyFolderJob() /* * The basic strategy is to first create the target folder, then copy all the mail - * from the source to the target folder, then recurse for each of the folder's children + * from the source to the target folder, then recurse for each of the folder's tqchildren */ void CopyFolderJob::execute() { @@ -113,7 +113,7 @@ void CopyFolderJob::slotCopyCompleted( KMCommand* command ) rollback(); return; } - // if we have children, recurse + // if we have tqchildren, recurse if ( mStorage->folder()->child() ) { slotCopyNextChild(); } else { @@ -144,7 +144,7 @@ void CopyFolderJob::slotCopyNextChild( bool success ) mNextChildFolder = static_cast<KMFolder*>(node); ++mChildFolderNodeIterator; } else { - // no more children, we are done + // no more tqchildren, we are done emit folderCopyComplete( true ); deleteLater(); return; diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp index 3fe2fd78b..86166dbc2 100644 --- a/kmail/csshelper.cpp +++ b/kmail/csshelper.cpp @@ -77,7 +77,7 @@ namespace KMail { TQFont defaultFont = mBodyFont; defaultFont.setItalic( true ); for ( int i = 0 ; i < 3 ; ++i ) { - const TQString key = TQString( "quote%1-font" ).arg( i+1 ); + const TQString key = TQString( "quote%1-font" ).tqarg( i+1 ); mQuoteFont[i] = fonts.readFontEntry( key, &defaultFont ); } } diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index aa0a6c415..279c71ae6 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -22,7 +22,7 @@ #include <tqpopupmenu.h> #include <tqpushbutton.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqtoolbox.h> @@ -117,7 +117,7 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) "<i>Universal</i> which can be used for all kind of operations. " "You cannot bind keyboard shortcut to <i>Universal</i> templates.</p>" "</qt>" ); - mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) ); + mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg( help ) ); const TQString toToolTip = i18n( "Additional recipients of the message when forwarding" ); const TQString ccToolTip = i18n( "Additional recipients who get a copy of the message when forwarding" ); diff --git a/kmail/customtemplates_base.ui b/kmail/customtemplates_base.ui index df92c4f3e..7060794cc 100644 --- a/kmail/customtemplates_base.ui +++ b/kmail/customtemplates_base.ui @@ -15,7 +15,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -47,7 +47,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -147,7 +147,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -155,7 +155,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -181,7 +181,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> @@ -222,7 +222,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -260,7 +260,7 @@ <property name="text"> <string>Shortc&ut:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -282,7 +282,7 @@ <property name="text"> <string>&Template type:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index 5c9f87382..26f720ad6 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -39,7 +39,7 @@ #include <kmessagebox.h> #include <kinputdialog.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqlineedit.h> @@ -196,7 +196,7 @@ void DistributionListDialog::slotUser1() #endif KMessageBox::information( this, i18n( "<qt>Distribution list with the given name <b>%1</b> " - "already exists. Please select a different name.</qt>" ).arg( name ) ); + "already exists. Please select a different name.</qt>" ).tqarg( name ) ); return; } diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp index 4c26caab3..06537981b 100644 --- a/kmail/encodingdetector.cpp +++ b/kmail/encodingdetector.cpp @@ -38,7 +38,7 @@ #include "encodingdetector_ja_p.h" #include <tqregexp.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <kglobal.h> #include <kcharsets.h> diff --git a/kmail/encodingdetector.h b/kmail/encodingdetector.h index 9fe173069..0f2231782 100644 --- a/kmail/encodingdetector.h +++ b/kmail/encodingdetector.h @@ -35,7 +35,7 @@ class EncodingDetectorPrivate; * Searches for encoding declaration inside raw data -- meta and xml tags. * In the case it can't find it, uses heuristics for specified language. * - * If it finds unicode BOM marks, it changes encoding regardless of what the user has told + * If it finds tqunicode BOM marks, it changes encoding regardless of what the user has told * * Intended lifetime of the object: one instance per document. * diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp index 5106e2f2f..65de61a33 100644 --- a/kmail/expirejob.cpp +++ b/kmail/expirejob.cpp @@ -162,7 +162,7 @@ void ExpireJob::done() moving = true; str = i18n( "Removing 1 old message from folder %1...", "Removing %n old messages from folder %1...", count ) - .arg( mSrcFolder->label() ); + .tqarg( mSrcFolder->label() ); } else { // Expire by moving mMoveToFolder = @@ -170,7 +170,7 @@ void ExpireJob::done() if ( !mMoveToFolder ) { str = i18n( "Cannot expire messages from folder %1: destination " "folder %2 not found" ) - .arg( mSrcFolder->label(), mSrcFolder->expireToFolderId() ); + .tqarg( mSrcFolder->label(), mSrcFolder->expireToFolderId() ); kdWarning(5006) << str << endl; } else { kdDebug(5006) << "ExpireJob: finished expiring in folder " @@ -185,7 +185,7 @@ void ExpireJob::done() str = i18n( "Moving 1 old message from folder %1 to folder %2...", "Moving %n old messages from folder %1 to folder %2...", count ) - .arg( mSrcFolder->label(), mMoveToFolder->label() ); + .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); } } } @@ -213,34 +213,34 @@ void ExpireJob::slotMessagesMoved( KMCommand *command ) msg = i18n( "Removed 1 old message from folder %1.", "Removed %n old messages from folder %1.", mRemovedMsgs.count() ) - .arg( mSrcFolder->label() ); + .tqarg( mSrcFolder->label() ); } else { msg = i18n( "Moved 1 old message from folder %1 to folder %2.", "Moved %n old messages from folder %1 to folder %2.", mRemovedMsgs.count() ) - .arg( mSrcFolder->label(), mMoveToFolder->label() ); + .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); } break; case KMCommand::Failed: if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) { msg = i18n( "Removing old messages from folder %1 failed." ) - .arg( mSrcFolder->label() ); + .tqarg( mSrcFolder->label() ); } else { msg = i18n( "Moving old messages from folder %1 to folder %2 failed." ) - .arg( mSrcFolder->label(), mMoveToFolder->label() ); + .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); } break; case KMCommand::Canceled: if ( mSrcFolder->expireAction() == KMFolder::ExpireDelete ) { msg = i18n( "Removing old messages from folder %1 was canceled." ) - .arg( mSrcFolder->label() ); + .tqarg( mSrcFolder->label() ); } else { msg = i18n( "Moving old messages from folder %1 to folder %2 was " "canceled." ) - .arg( mSrcFolder->label(), mMoveToFolder->label() ); + .tqarg( mSrcFolder->label(), mMoveToFolder->label() ); } default: ; } diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp index bf0c7ffe0..e992eace5 100644 --- a/kmail/expirypropertiesdialog.cpp +++ b/kmail/expirypropertiesdialog.cpp @@ -13,7 +13,7 @@ #include <tqradiobutton.h> #include <tqbuttongroup.h> #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -73,7 +73,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo labelDays2 = new TQLabel( privateLayoutWidget, "labelDays2" ); labelDays2->setText( i18n( "days" ) ); - labelDays2->setAlignment( int( TQLabel::AlignTop ) ); + labelDays2->tqsetAlignment( int( TQLabel::AlignTop ) ); unreadHBox->addWidget( labelDays2 ); globalVBox->addLayout( unreadHBox ); @@ -81,7 +81,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo expiryActionLabel = new TQLabel( privateLayoutWidget, "expiryActionLabel" ); expiryActionLabel->setText( i18n( "Expiry action:" ) ); - expiryActionLabel->setAlignment( int( TQLabel::AlignVCenter ) ); + expiryActionLabel->tqsetAlignment( int( TQLabel::AlignVCenter ) ); expiryActionHBox->addWidget( expiryActionLabel ); actionsHBox = new TQVBoxLayout( 0, 0, 6, "actionsHBox"); @@ -111,7 +111,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo note = new TQLabel( privateLayoutWidget, "note" ); note->setText( i18n( "Note: Expiry action will be applied immediately after confirming settings." ) ); - note->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + note->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); globalVBox->addWidget( note ); // Load the values from the folder @@ -144,7 +144,7 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo folderSelector->setFolder( destFolder ); } slotUpdateControls(); - resize( TQSize(295, 204).expandedTo(minimumSizeHint()) ); + resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 6715f4865..e1689a9af 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -253,7 +253,7 @@ void FavoriteFolderView::itemClicked(TQListViewItem * item) if ( !item ) return; if ( !item->isSelected() ) item->setSelected( true ); - item->repaint(); + item->tqrepaint(); handleGroupwareFolder( static_cast<KMFolderTreeItem*>( item ) ); } @@ -267,11 +267,11 @@ void FavoriteFolderView::folderTreeSelectionChanged(KMFolder * folder) fti->setSelected( true ); setCurrentItem( fti ); ensureItemVisible( fti ); - fti->repaint(); + fti->tqrepaint(); found = true; } else if ( fti->folder() != folder && fti->isSelected() ) { fti->setSelected( false ); - fti->repaint(); + fti->tqrepaint(); } } blockSignals( false ); @@ -405,13 +405,13 @@ TQString FavoriteFolderView::prettyName(KMFolderTreeItem * fti) if ( fti->protocol() == KFolderTreeItem::Local || fti->protocol() == KFolderTreeItem::NONE ) { name = i18n( "Local Inbox" ); } else { - name = i18n( "Inbox of %1" ).arg( accountFti->text( 0 ) ); + name = i18n( "Inbox of %1" ).tqarg( accountFti->text( 0 ) ); } } else { if ( fti->protocol() != KFolderTreeItem::Local && fti->protocol() != KFolderTreeItem::NONE ) { - name = i18n( "%1 on %2" ).arg( fti->text( 0 ) ).arg( accountFti->text( 0 ) ); + name = i18n( "%1 on %2" ).tqarg( fti->text( 0 ) ).tqarg( accountFti->text( 0 ) ); } else { - name = i18n( "%1 (local)" ).arg( fti->text( 0 ) ); + name = i18n( "%1 (local)" ).tqarg( fti->text( 0 ) ); } } return name; @@ -524,7 +524,7 @@ void FavoriteFolderView::refresh() KMFolderTreeItem* fti = static_cast<KMFolderTreeItem*>(it.current()); if (!fti || !fti->folder()) continue; - fti->repaint(); + fti->tqrepaint(); } update(); } diff --git a/kmail/filehtmlwriter.h b/kmail/filehtmlwriter.h index ec008adf5..879143228 100644 --- a/kmail/filehtmlwriter.h +++ b/kmail/filehtmlwriter.h @@ -35,7 +35,7 @@ #include "interfaces/htmlwriter.h" #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> class TQString; diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index 5fe88636b..d63278ad7 100644 --- a/kmail/filterimporterexporter.cpp +++ b/kmail/filterimporterexporter.cpp @@ -41,7 +41,7 @@ #include <kpushbutton.h> #include <tqregexp.h> -#include <layout.h> +#include <tqlayout.h> using namespace KMail; diff --git a/kmail/filterlog.h b/kmail/filterlog.h index de73ac253..83a2b3833 100644 --- a/kmail/filterlog.h +++ b/kmail/filterlog.h @@ -31,7 +31,7 @@ #include <tqobject.h> #include <tqstringlist.h> -#include <stylesheet.h> +#include <tqstylesheet.h> namespace KMail { diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index 137f61655..33bfa8d39 100644 --- a/kmail/filterlogdlg.cpp +++ b/kmail/filterlogdlg.cpp @@ -40,7 +40,7 @@ #include <tqlabel.h> #include <tqspinbox.h> #include <tqstringlist.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqvbox.h> #include <tqwhatsthis.h> #include <tqvgroupbox.h> @@ -257,7 +257,7 @@ void FilterLogDialog::slotUser2() KMessageBox::error( this, i18n( "Could not write the file %1:\n" "\"%2\" is the detailed error description." ) - .arg( fileName, + .tqarg( fileName, TQString::fromLocal8Bit( strerror( errno ) ) ), i18n( "KMail Error" ) ); } diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 507b34c37..26daf6a23 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -52,7 +52,7 @@ #include <kdebug.h> #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqvbox.h> #include <tqvbuttongroup.h> @@ -244,7 +244,7 @@ static TQString permissionsToUserString( unsigned int permissions, const TQStrin if ( internalRightsList.isEmpty() ) return i18n( "Custom Permissions" ); // not very helpful, but shouldn't happen else - return i18n( "Custom Permissions (%1)" ).arg( internalRightsList ); + return i18n( "Custom Permissions (%1)" ).tqarg( internalRightsList ); } void KMail::FolderDiaACLTab::ListViewItem::setPermissions( unsigned int permissions ) @@ -328,7 +328,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, topLayout->addWidget( mStack ); mLabel = new TQLabel( mStack ); - mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak ); + mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak ); mStack->addWidget( mLabel ); mACLWidget = new TQHBox( mStack ); @@ -352,7 +352,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, mEditACL = new KPushButton( i18n( "Modify Entry..." ), buttonBox ); mRemoveACL = new KPushButton( i18n( "Remove Entry" ), buttonBox ); TQWidget *spacer = new TQWidget( buttonBox ); - spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + spacer->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) ); connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) ); @@ -453,7 +453,7 @@ void KMail::FolderDiaACLTab::load() KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); if ( folder && folder->storage() == mImapAccount->rootFolder() ) return; // nothing to be done for the (virtual) account folder - mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) ); ImapAccountBase::ConnectionState state = mImapAccount->makeConnection(); if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); @@ -471,7 +471,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error - mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) ); else // Connection error (error message box already shown by the account) mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) ); @@ -521,7 +521,7 @@ void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, c if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) mLabel->setText( i18n( "This IMAP server does not have support for access control lists (ACL)" ) ); else - mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).arg( job->errorString() ) ); + mLabel->setText( i18n( "Error retrieving access control list (ACL) from server\n%1" ).tqarg( job->errorString() ) ); return; } @@ -632,7 +632,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL() return; if ( !ACLitem->isNew() ) { if ( mImapAccount && mImapAccount->login() == ACLitem->userId() ) { - if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( topLevelWidget(), + if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel( tqtopLevelWidget(), i18n( "Do you really want to remove your own permissions for this folder? You will not be able to access it afterwards." ), i18n( "Remove" ) ) ) return; } @@ -642,7 +642,7 @@ void KMail::FolderDiaACLTab::slotRemoveACL() emit changed(true); } -KMail::FolderDiaTab::AccepStatus KMail::FolderDiaACLTab::accept() +KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaACLTab::accept() { if ( !mChanged || !mImapAccount ) return Accepted; // (no change made), ok for accepting the dialog immediately diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h index f518cbd35..901e12d1e 100644 --- a/kmail/folderdiaacltab.h +++ b/kmail/folderdiaacltab.h @@ -94,7 +94,7 @@ public: virtual void load(); virtual bool save(); - virtual AccepStatus accept(); + virtual AcceptqStatus accept(); static bool supports( KMFolder* refFolder ); diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index 06a5d4198..195a00b1f 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -39,7 +39,7 @@ #include "imapaccountbase.h" #include <tqwidgetstack.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqprogressbar.h> #include <tqwhatsthis.h> @@ -62,7 +62,7 @@ KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* pare topLayout->addWidget( mStack ); mLabel = new TQLabel( mStack ); - mLabel->setAlignment( AlignHCenter | AlignVCenter | WordBreak ); + mLabel->tqsetAlignment( AlignHCenter | AlignVCenter | WordBreak ); mStack->addWidget( mLabel ); mQuotaWidget = new KMail::QuotaWidget( mStack ); @@ -117,7 +117,7 @@ void KMail::FolderDiaQuotaTab::load() KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); if ( folder && folder->storage() == mImapAccount->rootFolder() ) return; // nothing to be done for the (virtual) account folder - mLabel->setText( i18n( "Connecting to server %1, please wait..." ).arg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) ); ImapAccountBase::ConnectionState state = mImapAccount->makeConnection(); if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); @@ -136,7 +136,7 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error - mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); + mLabel->setText( i18n( "Error connecting to server %1" ).tqarg( mImapAccount->host() ) ); else // Connection error (error message box already shown by the account) mLabel->setText( KIO::buildErrorString( errorCode, errorMsg ) ); @@ -162,7 +162,7 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder, if ( job->error() == KIO::ERR_UNSUPPORTED_ACTION ) mLabel->setText( i18n( "This account does not have support for quota information." ) ); else - mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).arg( job->errorString() ) ); + mLabel->setText( i18n( "Error retrieving quota information from server\n%1" ).tqarg( job->errorString() ) ); } else { mQuotaInfo = info; } @@ -187,7 +187,7 @@ void KMail::FolderDiaQuotaTab::showQuotaWidget() } -KMail::FolderDiaTab::AccepStatus KMail::FolderDiaQuotaTab::accept() +KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaQuotaTab::accept() { if ( mFolderType == KMFolderTypeCachedImap || mFolderType == KMFolderTypeImap ) return Accepted; diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h index be91bba2b..9d2d968db 100644 --- a/kmail/folderdiaquotatab.h +++ b/kmail/folderdiaquotatab.h @@ -60,7 +60,7 @@ public: virtual void load(); virtual bool save(); - virtual AccepStatus accept(); + virtual AcceptqStatus accept(); static bool supports( KMFolder* refFolder ); diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp index 70885b7d3..98c3579c8 100644 --- a/kmail/folderdiaquotatab_p.cpp +++ b/kmail/folderdiaquotatab_p.cpp @@ -31,7 +31,7 @@ #include "folderdiaquotatab_p.h" -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqprogressbar.h> #include <tqwhatsthis.h> @@ -56,19 +56,19 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name ) { TQVBoxLayout *box = new TQVBoxLayout(this); TQWidget *stuff = new TQWidget( this ); - TQGridLayout* layout = + TQGridLayout* tqlayout = new TQGridLayout( stuff, 3, 3, KDialog::marginHint(), KDialog::spacingHint() ); mInfoLabel = new TQLabel("", stuff ); mRootLabel = new TQLabel("", stuff ); mProgressBar = new TQProgressBar( stuff ); - layout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 ); - layout->addWidget( mRootLabel, 0, 1 ); - layout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 ); - //layout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 ); - layout->addWidget( mInfoLabel, 1, 1 ); - layout->addWidget( mProgressBar, 2, 1 ); + tqlayout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 ); + tqlayout->addWidget( mRootLabel, 0, 1 ); + tqlayout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 ); + //tqlayout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 ); + tqlayout->addWidget( mInfoLabel, 1, 1 ); + tqlayout->addWidget( mProgressBar, 2, 1 ); box->addWidget( stuff ); box->addStretch( 2 ); } diff --git a/kmail/folderpropertiesdialog.ui b/kmail/folderpropertiesdialog.ui index c21b2d4b7..b154aac12 100644 --- a/kmail/folderpropertiesdialog.ui +++ b/kmail/folderpropertiesdialog.ui @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -140,13 +140,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>28</width> <height>28</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>28</width> <height>28</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -188,13 +188,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>28</width> <height>28</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>28</width> <height>28</height> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>20</height> @@ -296,7 +296,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -434,7 +434,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -507,7 +507,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>120</width> <height>80</height> diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp index 0730e7bfe..23636e365 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -36,7 +36,7 @@ #include <kiconloader.h> #include <kdialog.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtoolbutton.h> namespace KMail { @@ -55,7 +55,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree ) button->setIconSet( KGlobal::iconLoader()->loadIconSet( "folder", KIcon::Small, 0 ) ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) ); - setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); setFocusPolicy( TQ_StrongFocus ); } @@ -104,7 +104,7 @@ void FolderRequester::setFolder( const TQString &idString ) setFolder( folder ); } else { if ( !idString.isEmpty() ) { - edit->setText( i18n( "Unknown folder '%1'" ).arg( idString ) ); + edit->setText( i18n( "Unknown folder '%1'" ).tqarg( idString ) ); } else { edit->setText( i18n( "Please select a folder" ) ); } diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp index 770b6cfc6..9095a647b 100644 --- a/kmail/foldershortcutdialog.cpp +++ b/kmail/foldershortcutdialog.cpp @@ -56,7 +56,7 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder, TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, - i18n( "Shortcut for Folder %1" ).arg( folder->label() ), + i18n( "Shortcut for Folder %1" ).tqarg( folder->label() ), KDialogBase::Ok | KDialogBase::Cancel ), mFolder( folder ), mMainWidget( mainwidget ) { diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index 53d7f66d8..63dc91fb5 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -174,7 +174,7 @@ void FolderStorage::markNewAsUnread() if (!(msgBase = getMsgBase(i))) continue; if (msgBase->isNew()) { - msgBase->seStatus(KMMsgStatusUnread); + msgBase->setqStatus(KMMsgStatusUnread); msgBase->setDirty(true); } } @@ -503,7 +503,7 @@ KMMessage* FolderStorage::getMsg(int idx) kdDebug(5006) << "Error: " << location() << " Index file is inconsistent with folder file. This should never happen." << endl; - // We can't recreate the index at this point, since that would invalidate the current + // We can't recreate the index at this point, since that would tqinvalidate the current // message list and delete KMMsgBase or KMMessage objects that are in use. // Do it later in KMFolderIndex::readIndexHeader() instead. mCompactable = false; // Don't compact @@ -861,18 +861,18 @@ bool FolderStorage::isCloseToQuota() const } //----------------------------------------------------------------------------- -void FolderStorage::msgStatusChanged(const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, int idx) +void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx) { int oldUnread = 0; int newUnread = 0; - if (((oldStatus & KMMsgStatusUnread || oldStatus & KMMsgStatusNew) && - !(oldStatus & KMMsgStatusIgnored)) || + if (((oldtqStatus & KMMsgStatusUnread || oldtqStatus & KMMsgStatusNew) && + !(oldtqStatus & KMMsgStatusIgnored)) || (folder() == kmkernel->outboxFolder())) oldUnread = 1; - if (((newStatus & KMMsgStatusUnread || newStatus & KMMsgStatusNew) && - !(newStatus & KMMsgStatusIgnored)) || + if (((newtqStatus & KMMsgStatusUnread || newtqStatus & KMMsgStatusNew) && + !(newtqStatus & KMMsgStatusIgnored)) || (folder() == kmkernel->outboxFolder())) newUnread = 1; int deltaUnread = newUnread - oldUnread; @@ -1040,24 +1040,24 @@ void FolderStorage::setRDict( KMMsgDictREntry *rentry ) const } //----------------------------------------------------------------------------- -void FolderStorage::seStatus(int idx, KMMsgStatus status, bool toggle) +void FolderStorage::setqStatus(int idx, KMMsgtqStatus status, bool toggle) { KMMsgBase *msg = getMsgBase(idx); if ( msg ) { if (toggle) - msg->toggleStatus(status, idx); + msg->toggletqStatus(status, idx); else - msg->seStatus(status, idx); + msg->setqStatus(status, idx); } } //----------------------------------------------------------------------------- -void FolderStorage::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle) +void FolderStorage::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle) { for ( TQValueList<int>::Iterator it = ids.begin(); it != ids.end(); ++it ) { - FolderStorage::seStatus(*it, status, toggle); + FolderStorage::setqStatus(*it, status, toggle); } } diff --git a/kmail/folderstorage.h b/kmail/folderstorage.h index 6bc04df15..550b45e55 100644 --- a/kmail/folderstorage.h +++ b/kmail/folderstorage.h @@ -71,7 +71,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; * * @section Accounts * The accounts (of KMail) that are fed into the folder are - * represented as the children of the folder. They are only stored here + * represented as the tqchildren of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ @@ -109,10 +109,10 @@ public: /** Specify, that the folder can't contain mails. */ virtual void setNoContent(bool aNoContent); - /** Returns, if the folder can't have children */ + /** Returns, if the folder can't have tqchildren */ virtual bool noChildren() const { return mNoChildren; } - /** Specify, that the folder can't have children */ + /** Specify, that the folder can't have tqchildren */ virtual void setNoChildren( bool aNoChildren ); enum ChildrenState { @@ -120,11 +120,11 @@ public: HasNoChildren, ChildrenUnknown }; - /** Returns if the folder has children, - * has no children or we don't know */ + /** Returns if the folder has tqchildren, + * has no tqchildren or we don't know */ virtual ChildrenState hasChildren() const { return mHasChildren; } - /** Specify if the folder has children */ + /** Specify if the folder has tqchildren */ virtual void setHasChildren( ChildrenState state ) { mHasChildren = state; } @@ -245,10 +245,10 @@ public: * be reflected in the UI. */ virtual bool isCloseToQuota() const; - /** Called by KMMsgBase::seStatus when status of a message has changed + /** Called by KMMsgBase::setqStatus when status of a message has changed required to keep the number unread messages variable current. */ - virtual void msgStatusChanged( const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, + virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx); /** Open folder for access. @@ -364,10 +364,10 @@ public: void deregisterFromMessageDict(); /** Set the status of the message at index @p idx to @p status. */ - virtual void seStatus(int idx, KMMsgStatus status, bool toggle=false); + virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false); /** Set the status of the message(s) in the TQValueList @p ids to @p status. */ - virtual void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false); + virtual void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false); void removeJobs(); diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index 4355c9df2..8557388ac 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -108,9 +108,9 @@ void FolderTreeBase::readColorConfig() KConfig* conf = KMKernel::config(); // Custom/System color support KConfigGroupSaver saver(conf, "Reader"); - TQColor c1=TQColor(kapp->palette().active().text()); + TQColor c1=TQColor(kapp->tqpalette().active().text()); TQColor c2=TQColor("blue"); - TQColor c4=TQColor(kapp->palette().active().base()); + TQColor c4=TQColor(kapp->tqpalette().active().base()); TQColor c5=TQColor("red"); if (!conf->readBoolEntry("defaultColors",true)) { @@ -179,10 +179,10 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ } // set it - bool repaint = false; + bool tqrepaint = false; if (fti->unreadCount() != count) { fti->adjustUnreadCount( count ); - repaint = true; + tqrepaint = true; } if (isTotalActive() || force) { @@ -196,7 +196,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ // set it if ( count != fti->totalCount() ) { fti->setTotalCount(count); - repaint = true; + tqrepaint = true; } } if ( isSizeActive() || force ) { @@ -204,7 +204,7 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ TQ_INT64 size = folder->storage()->folderSize(); if ( size != fti->folderSize() ) { fti->setFolderSize( size ); - repaint = true; + tqrepaint = true; } } } @@ -213,8 +213,8 @@ void FolderTreeBase::slotUpdateCounts(KMFolder * folder, bool force /* = false*/ } if (fti->parent() && !fti->parent()->isOpen()) - repaint = false; // we're not visible - if (repaint) { + tqrepaint = false; // we're not visible + if (tqrepaint) { fti->setNeedsRepaint( true ); emit triggerRefresh(); } diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp index 0c2554dc0..40b543be7 100644 --- a/kmail/folderutil.cpp +++ b/kmail/folderutil.cpp @@ -92,7 +92,7 @@ void KMail::FolderUtil::deleteFolder( KMFolder *folderToDelete, TQWidget *parent KMessageBox::information(parent, i18n("<qt>The folder you deleted was associated with the account " "<b>%1</b> which delivered mail into it. The folder the account " - "delivers new mail into was reset to the main Inbox folder.</qt>").arg( (*it)->name())); + "delivers new mail into was reset to the main Inbox folder.</qt>").tqarg( (*it)->name())); } } if (folderToDelete->folderType() == KMFolderTypeImap) diff --git a/kmail/folderviewtooltip.h b/kmail/folderviewtooltip.h index dfc3bbbaf..8e4f56ddd 100644 --- a/kmail/folderviewtooltip.h +++ b/kmail/folderviewtooltip.h @@ -20,8 +20,8 @@ class FolderViewToolTip : public TQToolTip KMFolderTreeItem *item = dynamic_cast<KMFolderTreeItem*>( mListView->itemAt( point ) ); if ( !item ) return; - const TQRect itemRect = mListView->itemRect( item ); - if ( !itemRect.isValid() ) + const TQRect tqitemRect = mListView->tqitemRect( item ); + if ( !tqitemRect.isValid() ) return; const TQRect headerRect = mListView->header()->sectionRect( 0 ); if ( !headerRect.isValid() ) @@ -32,18 +32,18 @@ class FolderViewToolTip : public TQToolTip item->updateCount(); TQString tipText = i18n("<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4" ) - .arg( item->folder()->prettyURL().replace( " ", " " ) ) - .arg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) ) - .arg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) ) - .arg( KIO::convertSize( item->folderSize() ) ); + .tqarg( item->folder()->prettyURL().replace( " ", " " ) ) + .tqarg( item->totalCount() < 0 ? "-" : TQString::number( item->totalCount() ) ) + .tqarg( item->unreadCount() < 0 ? "-" : TQString::number( item->unreadCount() ) ) + .tqarg( KIO::convertSize( item->folderSize() ) ); if ( KMFolderCachedImap* imap = dynamic_cast<KMFolderCachedImap*>( item->folder()->storage() ) ) { QuotaInfo info = imap->quotaInfo(); if ( info.isValid() && !info.isEmpty() ) - tipText += i18n("<br>Quota: %1").arg( info.toString() ); + tipText += i18n("<br>Quota: %1").tqarg( info.toString() ); } - tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ), tipText ); + tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ), tipText ); } private: diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 7decd39f2..81a4252cb 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -145,7 +145,7 @@ TQ_UINT32 HeaderItem::msgSerNum() const // Update this item to summarise a new folder and message -//Opens all children in the thread +//Opens all tqchildren in the thread void HeaderItem::setOpenRecursive( bool open ) { if (open){ @@ -309,7 +309,7 @@ const TQPixmap *HeaderItem::pixmap(int col) const if ( msgBase->isWatched() ) pixmaps << *KMHeaders::pixWatched; } - if ( !headers->mPaintInfo.showStatus ) { + if ( !headers->mPaintInfo.showtqStatus ) { const TQPixmap *pix = statusIcon(msgBase); if ( pix ) pixmaps << *pix; } @@ -458,7 +458,7 @@ TQString HeaderItem::generate_key( KMHeaders *headers, int column = sortOrder & ((1 << 5) - 1); TQString ret = TQChar( (char)sortOrder ); - TQString sortArrival = TQString( "%1" ).arg( msg->getMsgSerNum(), 0, 36 ); + TQString sortArrival = TQString( "%1" ).tqarg( msg->getMsgSerNum(), 0, 36 ); while (sortArrival.length() < 7) sortArrival = '0' + sortArrival; if (column == paintInfo->dateCol) { diff --git a/kmail/headeritem.h b/kmail/headeritem.h index 34dee4de0..2142cf71b 100644 --- a/kmail/headeritem.h +++ b/kmail/headeritem.h @@ -80,20 +80,20 @@ public: /** Returns whether the item has other items below it. */ bool hasChildren() const { return mSortedChildren.count() || mUnsortedCount; } - /** The sorted children are an array of sortcache items we know are below the + /** The sorted tqchildren are an array of sortcache items we know are below the * current one and are already properly sorted (as read from the cache ) */ const TQPtrList<SortCacheItem> *sortedChildren() const { return &mSortedChildren; } - /** The unsorted children are an array of sortcache items we know are below the + /** The unsorted tqchildren are an array of sortcache items we know are below the * current one, but are yet to be threaded and sorted properly. */ SortCacheItem **unsortedChildren(int &count) const { count = mUnsortedCount; return mUnsortedChildren; } - /** Add an item to this itme's list of already sorted children. */ + /** Add an item to this itme's list of already sorted tqchildren. */ void addSortedChild(SortCacheItem *i) { i->mParent = this; mSortedChildren.append(i); } - /** Add an item to this itme's list of unsorted children. */ + /** Add an item to this itme's list of unsorted tqchildren. */ void addUnsortedChild(SortCacheItem *i) { i->mParent = this; if(!mUnsortedChildren) @@ -104,7 +104,7 @@ public: mUnsortedChildren[mUnsortedCount++] = i; } - /** Clear the sorted and unsorted children datastructures. */ + /** Clear the sorted and unsorted tqchildren datastructures. */ void clearChildren() { mSortedChildren.clear(); free( mUnsortedChildren ); @@ -185,7 +185,7 @@ public: // Return the serial number of the message associated with this item; TQ_UINT32 msgSerNum() const; - /** Expands all children of the list view item. */ + /** Expands all tqchildren of the list view item. */ void setOpenRecursive( bool open ); /** Returns the text of the list view item. */ diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index 5fe00e022..4d5669a1a 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -51,7 +51,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, KListView *listView, KActionCollection *actionCollection, const char *name ) - : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0), statusList() + : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mtqStatus(0), statusList() { KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() @@ -72,16 +72,16 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, mStatusCombo->setSizeLimit( 12 ); mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") ); - inserStatus( StatusUnread ); - inserStatus( StatusNew ); - inserStatus( StatusImportant ); - inserStatus( StatusReplied ); - inserStatus( StatusForwarded ); - inserStatus( StatusToDo ); - inserStatus( StatusHasAttachment ); - inserStatus( StatusInvitation ); - inserStatus( StatusWatched ); - inserStatus( StatusIgnored ); + insertqStatus( StatusUnread ); + insertqStatus( StatusNew ); + insertqStatus( StatusImportant ); + insertqStatus( StatusReplied ); + insertqStatus( StatusForwarded ); + insertqStatus( StatusToDo ); + insertqStatus( StatusHasAttachment ); + insertqStatus( StatusInvitation ); + insertqStatus( StatusWatched ); + insertqStatus( StatusIgnored ); mStatusCombo->setCurrentItem( 0 ); mStatusCombo->installEventFilter( this ); connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ), @@ -145,10 +145,10 @@ bool HeaderListQuickSearch::eventFilter( TQObject *watched, TQEvent *event ) bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQString &s) const { mCurrentSearchTerm = s; // bit of a hack, but works - if ( mStatus != 0 ) { + if ( mtqStatus != 0 ) { KMHeaders *headers = static_cast<KMHeaders*>( item->listView() ); const KMMsgBase *msg = headers->getMsgBaseForItem( item ); - if ( !msg || ! ( msg->status() & mStatus ) ) + if ( !msg || ! ( msg->status() & mtqStatus ) ) return false; } @@ -176,13 +176,13 @@ void HeaderListQuickSearch::reset() void HeaderListQuickSearch::sloStatusChanged( int index ) { if ( index == 0 ) - mStatus = 0; + mtqStatus = 0; else - mStatus = KMSearchRuleStatus::statusFromEnglishName( statusList[index - 1] ); + mtqStatus = KMSearchRuletqStatus::statusFromEnglishName( statusList[index - 1] ); updateSearch(); } -void HeaderListQuickSearch::inserStatus(KMail::StatusValueTypes which) +void HeaderListQuickSearch::insertqStatus(KMail::StatusValueTypes which) { mStatusCombo->insertItem( SmallIcon( KMail::StatusValues[which].icon ), i18n( KMail::StatusValues[ which ].text ) ); @@ -196,9 +196,9 @@ TQString HeaderListQuickSearch::currentSearchTerm() const } -int HeaderListQuickSearch::currenStatus() const +int HeaderListQuickSearch::currentqStatus() const { - return mStatus; + return mtqStatus; } } // namespace KMail diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h index 0e3c4c9de..e0589c7d6 100644 --- a/kmail/headerlistquicksearch.h +++ b/kmail/headerlistquicksearch.h @@ -31,7 +31,7 @@ #ifndef KMAILHEADERLISTQUICKSEARCH_H #define KMAILHEADERLISTQUICKSEARCH_H -#include "kmmsgbase.h" // for KMMsgStatus +#include "kmmsgbase.h" // for KMMsgtqStatus #include "kmsearchpattern.h" #include <klistviewsearchline.h> #include <tqvaluevector.h> @@ -67,7 +67,7 @@ public: /** * Returns the currently selected status filter. */ - int currenStatus() const; + int currentqStatus() const; public slots: void reset(); @@ -78,22 +78,22 @@ signals: protected: /** * checks whether @param item contains the search string and has the status - * currently in mStatus + * currently in mtqStatus */ virtual bool itemMatches(const TQListViewItem *item, const TQString &s) const; private slots: /** - * cache the status in mStatus so as to avoid having to do the comparatively + * cache the status in mtqStatus so as to avoid having to do the comparatively * expensive string comparison for each item in itemMatches */ void sloStatusChanged( int index ); private: /** Helper method for the filling of the status combo. */ - void inserStatus(KMail::StatusValueTypes which); + void insertqStatus(KMail::StatusValueTypes which); TQComboBox *mStatusCombo; - KMMsgStatus mStatus; + KMMsgtqStatus mtqStatus; TQValueVector<TQString> statusList; mutable TQString mCurrentSearchTerm; }; diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 5686d2c0d..ac45aeeb6 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -82,10 +82,10 @@ namespace KMail { static TQString convertToHtmlBlock( const TQString & str, bool useSpan=false ) { TQString dir = directionOf( str ); TQString format = "<%1 dir=\"%3\">%4</%2>"; - return format.arg( useSpan ? "span" : "div" ) - .arg( useSpan ? "span" : "div" ) - .arg( dir ) - .arg( LinkLocator::convertToHtml( str ) ); + return format.tqarg( useSpan ? "span" : "div" ) + .tqarg( useSpan ? "span" : "div" ) + .tqarg( dir ) + .tqarg( LinkLocator::convertToHtml( str ) ); } #endif @@ -124,7 +124,7 @@ namespace KMail { strategy = HeaderStrategy::brief(); // The direction of the header is determined according to the direction - // of the application layout. + // of the application tqlayout. TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ; @@ -223,7 +223,7 @@ namespace KMail { strategy = HeaderStrategy::rich(); // The direction of the header is determined according to the direction - // of the application layout. + // of the application tqlayout. TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); @@ -262,13 +262,13 @@ namespace KMail { return headerStr + "</div>"; } - headerStr = TQString("<div class=\"header\" dir=\"%1\">").arg(dir); + headerStr = TQString("<div class=\"header\" dir=\"%1\">").tqarg(dir); //case HdrLong: if ( strategy->showHeader( "subject" ) ) headerStr += TQString("<div dir=\"%1\"><b style=\"font-size:130%\">" + strToHtml(message->subject()) + "</b></div>\n") - .arg(subjectDir); + .tqarg(subjectDir); if ( strategy->showHeader( "date" ) ) headerStr.append(i18n("Date: ") + strToHtml(dateString)+"<br>\n"); @@ -408,9 +408,9 @@ namespace KMail { } } TQString titleText = i18n("%1% probability of being spam.\n\nFull report:\n%2") - .arg( TQString::number( percent ), filterHeader ); + .tqarg( TQString::number( percent ), filterHeader ); return TQString("<img src=\"%1\" width=\"%2\" height=\"%3\" style=\"border: 1px solid black;\" title=\"%4\"> ") - .arg( imgToDataUrl( meterBar, "PPM" ), TQString::number( 20 ), + .tqarg( imgToDataUrl( meterBar, "PPM" ), TQString::number( 20 ), TQString::number( 5 ), titleText ); } @@ -427,10 +427,10 @@ namespace KMail { // ### from kmreaderwin begin // The direction of the header is determined according to the direction - // of the application layout. + // of the application tqlayout. TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").arg(dir); + TQString headerStr = TQString("<div class=\"fancy header\" dir=\"%1\">\n").tqarg(dir); // However, the direction of the message subject within the header is // determined according to the contents of the subject itself. Since @@ -457,7 +457,7 @@ namespace KMail { } // Spam header display. - // If the spamSpamStatus config value is true then we look for headers + // If the spamSpamtqStatus config value is true then we look for headers // from a few spam filters and try to create visually meaningful graphics // out of the spam scores. @@ -493,8 +493,8 @@ namespace KMail { presence = imProxy->presenceString( kabcUid ); if ( !presence.isEmpty() ) { - TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" ) - .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) ); + TQString presenceIcon = TQString::tqfromLatin1( " <img src=\"%1\"/>" ) + .tqarg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) ); presence += presenceIcon; } } @@ -585,26 +585,26 @@ namespace KMail { { //kdDebug( 5006 ) << "Got a photo: " << photoURL << endl; userHTML = TQString("<img src=\"%1\" width=\"%2\" height=\"%3\">") - .arg( photoURL ).arg( photoWidth ).arg( photoHeight ); + .tqarg( photoURL ).tqarg( photoWidth ).tqarg( photoHeight ); if ( presence.isEmpty() ) { userHTML = TQString("<div class=\"senderpic\">") + userHTML + "</div>"; } else { userHTML = TQString( "<div class=\"senderpic\">" "<a href=\"im:%1\">%2<div class=\"senderstatus\">" "<span name=\"presence-%3\">%4</span></div></a>" - "</div>" ).arg( kabcUid ) - .arg( userHTML ) - .arg( kabcUid ) - .arg( presence ); + "</div>" ).tqarg( kabcUid ) + .tqarg( userHTML ) + .tqarg( kabcUid ) + .tqarg( presence ); } } else { // we don't have a photo, just show presence, if we have it if ( !presence.isEmpty() ) userHTML = TQString( "<a href=\"im:%1\"><div class=\"senderstatus\">" "<span name=\"presence-%2\">%3</span></div></a>" ) - .arg( kabcUid ) - .arg( kabcUid ) - .arg( presence ); + .tqarg( kabcUid ) + .tqarg( kabcUid ) + .tqarg( presence ); } #if 0 // Disabled 'Launch IM' link in headers - Will @@ -719,12 +719,12 @@ namespace KMail { "margin: 0px 0px 3px 0px;" "\" class=\"curtime\">%4<br />%5<br />%6</div>" ) - .arg( bg_color ) - .arg( color ) - .arg( bg_image ) - .arg( i18n( "Now:" ) ) - .arg( currTime.toString( tformat ) ) - .arg( timeofday ) + .tqarg( bg_color ) + .tqarg( color ) + .tqarg( bg_image ) + .tqarg( i18n( "Now:" ) ) + .tqarg( currTime.toString( tformat ) ) + .tqarg( timeofday ) ); } else { @@ -739,8 +739,8 @@ namespace KMail { ( GlobalSettings::self()->showEmoticons() ? LinkLocator::ReplaceSmileys : 0 ); headerStr += TQString("<div dir=\"%1\">%2</div>\n") - .arg(subjectDir) - .arg(message->subject().isEmpty()? + .tqarg(subjectDir) + .tqarg(message->subject().isEmpty()? i18n("No Subject") : strToHtml( message->subject(), flags )); } @@ -755,11 +755,11 @@ namespace KMail { fromStr = message->fromStrip(); // let's use that headerStr += TQString("<tr><th>%1</th>\n" "<td>") - .arg(i18n("From: ")) + .tqarg(i18n("From: ")) + KMMessage::emailAddrAsAnchor( fromStr, false ) + ( !message->headerField( "Resent-From" ).isEmpty() ? " " + i18n("(resent from %1)") - .arg( KMMessage::emailAddrAsAnchor( + .tqarg( KMMessage::emailAddrAsAnchor( message->headerField( "Resent-From" ),false) ) : TQString("") ) + ( !vCardName.isEmpty() ? " <a href=\"" + vCardName + "\">" @@ -781,37 +781,37 @@ namespace KMail { if ( strategy->showHeader( "to" ) ) headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .arg(i18n("To: ")) - .arg(KMMessage::emailAddrAsAnchor(message->to(),false))); + .tqarg(i18n("To: ")) + .tqarg(KMMessage::emailAddrAsAnchor(message->to(),false))); // cc line, if any if ( strategy->showHeader( "cc" ) && !message->cc().isEmpty()) headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .arg(i18n("CC: ")) - .arg(KMMessage::emailAddrAsAnchor(message->cc(),false))); + .tqarg(i18n("CC: ")) + .tqarg(KMMessage::emailAddrAsAnchor(message->cc(),false))); // Bcc line, if any if ( strategy->showHeader( "bcc" ) && !message->bcc().isEmpty()) headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .arg(i18n("BCC: ")) - .arg(KMMessage::emailAddrAsAnchor(message->bcc(),false))); + .tqarg(i18n("BCC: ")) + .tqarg(KMMessage::emailAddrAsAnchor(message->bcc(),false))); if ( strategy->showHeader( "date" ) ) headerStr.append(TQString("<tr><th>%1</th>\n" "<td dir=\"%2\">%3</td></tr>\n") - .arg(i18n("Date: ")) - .arg( directionOf( message->dateStr() ) ) - .arg(strToHtml(dateString))); + .tqarg(i18n("Date: ")) + .tqarg( directionOf( message->dateStr() ) ) + .tqarg(strToHtml(dateString))); if ( GlobalSettings::self()->showUserAgent() ) { if ( strategy->showHeader( "user-agent" ) ) { if ( !message->headerField("User-Agent").isEmpty() ) { headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .arg(i18n("User-Agent: ")) - .arg( strToHtml( message->headerField("User-Agent") ) ) ); + .tqarg(i18n("User-Agent: ")) + .tqarg( strToHtml( message->headerField("User-Agent") ) ) ); } } @@ -819,8 +819,8 @@ namespace KMail { if ( !message->headerField("X-Mailer").isEmpty() ) { headerStr.append(TQString("<tr><th>%1</th>\n" "<td>%2</td></tr>\n") - .arg(i18n("X-Mailer: ")) - .arg( strToHtml( message->headerField("X-Mailer") ) ) ); + .tqarg(i18n("X-Mailer: ")) + .tqarg( strToHtml( message->headerField("X-Mailer") ) ) ); } } } @@ -829,19 +829,19 @@ namespace KMail { /* if( strategy->showHeader( "status" ) ) headerStr.append( TQString( "<tr><th>%1</th>\n" "<td dir=\"%2\">%3</td></tr>\n") - .arg(i18n("Sender status: ")) - .arg( directionOf( onlineStatus ) ) - .arg(onlineStatus)); + .tqarg(i18n("Sender status: ")) + .tqarg( directionOf( onlinetqStatus ) ) + .tqarg(onlinetqStatus)); */ headerStr.append( TQString("<tr><td colspan=\"2\"><div id=\"attachmentInjectionPoint\"></div></td></tr>" ) ); headerStr.append( TQString( "</table></td><td align=\"center\" valign=\"top\">%1%2</td></tr></table>\n" ) - .arg(timeHTML) - .arg(userHTML) ); + .tqarg(timeHTML) + .tqarg(userHTML) ); if ( !spamHTML.isEmpty() ) headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b> <span style=\"padding-left: 20px;\">%3</span></div>\n") - .arg( subjectDir, i18n("Spam Status:"), spamHTML ) ); + .tqarg( subjectDir, i18n("Spam Status:"), spamHTML ) ); headerStr += "</div>\n\n"; return headerStr; @@ -853,8 +853,8 @@ namespace KMail { TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); image.save( &buffer, fmt ); - return TQString::fromLatin1("data:image/%1;base64,%2") - .arg( fmt, KCodecs::base64Encode( ba ).data() ); + return TQString::tqfromLatin1("data:image/%1;base64,%2") + .tqarg( fmt, KCodecs::base64Encode( ba ).data() ); } // ##################### @@ -882,7 +882,7 @@ namespace KMail { strategy = HeaderStrategy::brief(); // The direction of the header is determined according to the direction - // of the application layout. + // of the application tqlayout. TQString dir = TQApplication::reverseLayout() ? "rtl" : "ltr" ; @@ -901,7 +901,7 @@ namespace KMail { // colors depend on if its encapsulated or not TQColor fontColor(TQt::white); TQString linkColor = "class =\"white\""; - const TQColor activeColor = tqApp->palette().active().highlight(); + const TQColor activeColor = tqApp->tqpalette().active().highlight(); TQColor activeColorDark = activeColor.dark(130); // reverse colors for encapsulated if( !topLevel ){ diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp index d8c002515..79af65979 100644 --- a/kmail/htmlstatusbar.cpp +++ b/kmail/htmlstatusbar.cpp @@ -52,9 +52,9 @@ KMail::HtmlStatusBar::HtmlStatusBar( TQWidget * parent, const char * name, WFlag : TQLabel( parent, name, f ), mMode( Normal ) { - setAlignment( AlignHCenter|AlignTop ); + tqsetAlignment( AlignHCenter|AlignTop ); // Don't force a minimum height to the reader widget - setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); upd(); } diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index 1b621ef95..f32c014ae 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -73,12 +73,12 @@ using KMail::FolderRequester; #include <tqtabwidget.h> #include <tqlabel.h> #include <tqwhatsthis.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqgroupbox.h> -#include <textedit.h> +#include <tqtextedit.h> // other headers: #include <gpgmepp/key.h> @@ -427,16 +427,16 @@ namespace KMail { // Tab Widget: Signature // mSignatureConfigurator = new SignatureConfigurator( tabWidget ); - mSignatureConfigurator->layout()->setMargin( KDialog::marginHint() ); + mSignatureConfigurator->tqlayout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSignatureConfigurator, i18n("&Signature") ); mXFaceConfigurator = new XFaceConfigurator( tabWidget ); - mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() ); + mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") ); - KConfigGroup geometry( KMKernel::config(), "Geometry" ); - if ( geometry.hasKey( "Identity Dialog size" ) ) - resize( geometry.readSizeEntry( "Identity Dialog size" ) ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + if ( tqgeometry.hasKey( "Identity Dialog size" ) ) + resize( tqgeometry.readSizeEntry( "Identity Dialog size" ) ); mNameEdit->setFocus(); connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), @@ -444,8 +444,8 @@ namespace KMail { } IdentityDialog::~IdentityDialog() { - KConfigGroup geometry( KMKernel::config(), "Geometry" ); - geometry.writeEntry( "Identity Dialog size", size() ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + tqgeometry.writeEntry( "Identity Dialog size", size() ); } void IdentityDialog::slotAboutToShow( TQWidget * w ) { @@ -527,7 +527,7 @@ void IdentityDialog::slotOk() { for ( TQStringList::const_iterator it = aliases.begin(), end = aliases.end() ; it != end ; ++it ) { if ( !isValidSimpleEmailAddress( *it ) ) { TQString errorMsg( simpleEmailAddressErrorMsg()); - KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").arg( *it ) ); + KMessageBox::sorry( this, errorMsg, i18n("Invalid Email Alias \"%1\"").tqarg( *it ) ); return; } } @@ -580,7 +580,7 @@ void IdentityDialog::slotOk() { } if ( err ) - if ( KMessageBox::warningContinueCancel( this, msg.arg( email ), + if ( KMessageBox::warningContinueCancel( this, msg.tqarg( email ), i18n("Email Address Not Found in Key/Certificates"), KStdGuiItem::cont(), "warn_email_not_in_certificate" ) != KMessageBox::Continue) @@ -612,7 +612,7 @@ void IdentityDialog::slotOk() { void IdentityDialog::setIdentity( KPIM::Identity & ident ) { - setCaption( i18n("Edit Identity \"%1\"").arg( ident.identityName() ) ); + setCaption( i18n("Edit Identity \"%1\"").tqarg( ident.identityName() ) ); // "General" tab: mNameEdit->setText( ident.fullName() ); @@ -641,7 +641,7 @@ void IdentityDialog::slotOk() { "\"%1\" does not exist (anymore); " "therefore, the default sent-mail folder " "will be used.") - .arg( ident.identityName() ) ) ) + .tqarg( ident.identityName() ) ) ) mFccCombo->setFolder( kmkernel->sentFolder() ); else mFccCombo->setFolder( ident.fcc() ); @@ -652,7 +652,7 @@ void IdentityDialog::slotOk() { "\"%1\" does not exist (anymore); " "therefore, the default drafts folder " "will be used.") - .arg( ident.identityName() ) ) ) + .tqarg( ident.identityName() ) ) ) mDraftsCombo->setFolder( kmkernel->draftsFolder() ); else mDraftsCombo->setFolder( ident.drafts() ); @@ -663,14 +663,14 @@ void IdentityDialog::slotOk() { "\"%1\" does not exist (anymore); " "therefore, the default templates folder " "will be used.") - .arg( ident.identityName() ) ) ) + .tqarg( ident.identityName() ) ) ) mTemplatesCombo->setFolder( kmkernel->templatesFolder() ); else mTemplatesCombo->setFolder( ident.templates() ); // "Templates" tab: uint identity = ident.uoid(); - TQString iid = TQString("IDENTITY_%1").arg( identity ); + TQString iid = TQString("IDENTITY_%1").tqarg( identity ); Templates t( iid ); mCustom->setChecked(t.useCustomTemplates()); mWidget->loadFromIdentity( identity ); @@ -709,7 +709,7 @@ void IdentityDialog::slotOk() { mTemplatesCombo->folder()->idString() : TQString() ); // "Templates" tab: uint identity = ident.uoid(); - TQString iid = TQString("IDENTITY_%1").arg( identity ); + TQString iid = TQString("IDENTITY_%1").tqarg( identity ); Templates t( iid ); kdDebug() << "use custom templates for identity " << identity << ": " << mCustom->isChecked() << endl; t.setUseCustomTemplates(mCustom->isChecked()); diff --git a/kmail/identitydrag.cpp b/kmail/identitydrag.cpp index 88df48f6a..106cb5896 100644 --- a/kmail/identitydrag.cpp +++ b/kmail/identitydrag.cpp @@ -54,7 +54,7 @@ namespace KMail { return 0; } - TQByteArray IdentityDrag::encodedData( const char * mimetype ) const { + TQByteArray IdentityDrag::tqencodedData( const char * mimetype ) const { TQByteArray a; if ( !qstrcmp( mimetype, kmailIdentityMimeType ) ) { @@ -73,7 +73,7 @@ namespace KMail { bool IdentityDrag::decode( const TQMimeSource * e, KPIM::Identity & i ) { if ( e->provides( kmailIdentityMimeType ) ) { - TQDataStream s( e->encodedData( kmailIdentityMimeType ), IO_ReadOnly ); + TQDataStream s( e->tqencodedData( kmailIdentityMimeType ), IO_ReadOnly ); s >> i; return true; } diff --git a/kmail/identitydrag.h b/kmail/identitydrag.h index d0e468a17..a93095ff5 100644 --- a/kmail/identitydrag.h +++ b/kmail/identitydrag.h @@ -52,7 +52,7 @@ namespace KMail { virtual ~IdentityDrag() {} const char * format( int i ) const; // reimp. TQMimeSource - TQByteArray encodedData( const char * mimetype ) const; // dto. + TQByteArray tqencodedData( const char * mimetype ) const; // dto. static bool canDecode( const TQMimeSource * e ); static bool decode( const TQMimeSource * e, KPIM::Identity & ident ); diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp index 7a5134457..5ce6f38c8 100644 --- a/kmail/identitylistview.cpp +++ b/kmail/identitylistview.cpp @@ -83,7 +83,7 @@ namespace KMail { setText( 0, i18n("%1: identity name. Used in the config " "dialog, section Identity, to indicate the " "default identity", "%1 (Default)") - .arg( ident.identityName() ) ); + .tqarg( ident.identityName() ) ); else setText( 0, ident.identityName() ); setText( 1, ident.fullEmailAddr() ); diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 73253dfea..f1dbaae11 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -67,7 +67,7 @@ using KIO::PasswordDialog; //using KIO::Scheduler; // use FQN below #include <tqregexp.h> -#include <stylesheet.h> +#include <tqstylesheet.h> namespace KMail { @@ -318,7 +318,7 @@ namespace KMail { mSlave = KIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() ); if ( !mSlave ) { KMessageBox::error(0, i18n("Could not start process for %1.") - .arg( getUrl().protocol() ) ); + .tqarg( getUrl().protocol() ) ); return Error; } if ( mSlave->isConnected() ) { @@ -400,7 +400,7 @@ namespace KMail { if (job->error()) { if ( !(*it).quiet ) - handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).arg( path ) + '\n' ); + handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).tqarg( path ) + '\n' ); emit subscriptionChangeFailed( job->errorString() ); // ## emit subscriptionChanged here in case anyone needs it to support continue/cancel } @@ -735,7 +735,7 @@ namespace KMail { if ( !done ) { TQString msg = i18n("KMail has detected a prefix entry in the " "configuration of the account \"%1\" which is obsolete with the " - "support of IMAP namespaces.").arg( name() ); + "support of IMAP namespaces.").tqarg( name() ); if ( list.contains( "" ) ) { // replace empty entry with the old prefix list.remove( "" ); @@ -879,13 +879,13 @@ namespace KMail { KMMessage* msg = jd.msgList.first(); // Use double-quotes around the subject to keep the sentence readable, // but don't use double quotes around the sender since from() might return a double-quoted name already - const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").arg( msg->subject() ); + const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").tqarg( msg->subject() ); const TQString from = msg->from().isEmpty() ? i18n( "<unknown>" ) : msg->from(); TQString myError = "<p><b>" + i18n("Error while uploading message") + "</b></p><p>" - + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").arg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) ) + + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").tqarg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) ) + "</p><p>" - + i18n("The destination folder was: <b>%1</b>.").arg( TQStyleSheet::escape( folder->prettyURL() ) ) + + i18n("The destination folder was: <b>%1</b>.").tqarg( TQStyleSheet::escape( folder->prettyURL() ) ) + "</p><p>" + i18n("The server reported:") + "</p>"; return handleJobError( job, myError ); @@ -908,7 +908,7 @@ namespace KMail { } readOnly = folder->isReadOnly(); } - error = i18n("The folder is too close to its quota limit. (%1)").arg( quotaAsString ); + error = i18n("The folder is too close to its quota limit. (%1)").tqarg( quotaAsString ); if ( readOnly ) { error += i18n("\nSince you do not have write privileges on this folder, " "please ask the owner of the folder to free up some space in it."); @@ -962,10 +962,10 @@ namespace KMail { // Show it in the status bar, in case the user has ticked "don't show again" if ( errorCode == KIO::ERR_CONNECTION_BROKEN ) KPIM::BroadcastStatus::instance()->seStatusMsg( - i18n( "The connection to account %1 was broken." ).arg( name() ) ); + i18n( "The connection to account %1 was broken." ).tqarg( name() ) ); else if ( errorCode == KIO::ERR_SERVER_TIMEOUT ) KPIM::BroadcastStatus::instance()->seStatusMsg( - i18n( "The connection to account %1 timed out." ).arg( name() ) ); + i18n( "The connection to account %1 timed out." ).tqarg( name() ) ); } else { if ( !errors.isEmpty() ) KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption ); @@ -1031,9 +1031,9 @@ namespace KMail { mCheckingSingleFolder = ( type == Single ); if ( checkingMail() ) { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); - connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + connect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); } else { slotCheckQueuedFolders(); @@ -1043,7 +1043,7 @@ namespace KMail { //----------------------------------------------------------------------------- void ImapAccountBase::slotCheckQueuedFolders() { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders; @@ -1141,10 +1141,10 @@ namespace KMail { void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart, DwBodyPart * parent, const DwMessage * dwmsg ) { - int children; + int tqchildren; for (int i = 0; i < count; i++) { - stream >> children; + stream >> tqchildren; KMMessagePart* part = new KMMessagePart( stream ); part->setParent( parentKMPart ); mBodyPartList.append( part ); @@ -1173,7 +1173,7 @@ namespace KMail { if ( !parentKMPart ) parentKMPart = part; - if (children > 0) + if (tqchildren > 0) { DwBodyPart* newparent = dwpart; const DwMessage* newmsg = dwmsg; @@ -1188,13 +1188,13 @@ namespace KMail { if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent newParentKMPart = parentKMPart; - constructParts( stream, children, newParentKMPart, newparent, newmsg ); + constructParts( stream, tqchildren, newParentKMPart, newparent, newmsg ); } } } //----------------------------------------------------------------------------- - void ImapAccountBase::setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags ) + void ImapAccountBase::setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags ) { // set the status on the server, the uids are integrated in the path kdDebug(5006) << "setImapStatus path=" << path << " to: " << flags << endl; @@ -1218,7 +1218,7 @@ namespace KMail { TQT_SLOT(slotSeStatusResult(KIO::Job *))); } - void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen) + void ImapAccountBase::setImapSeentqStatus(KMFolder * folder, const TQString & path, bool seen) { KURL url = getUrl(); url.setPath(path); diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index d9f3e7cb3..533be4839 100644 --- a/kmail/imapaccountbase.h +++ b/kmail/imapaccountbase.h @@ -231,13 +231,13 @@ namespace KMail { * Set the status on the server * Emits imapStatusChanged signal on success/error. */ - void setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags ); + void setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags ); /** * Set seen status on the server. * Emits imapStatusChanged signal on success/error. */ - void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen ); + void setImapSeentqStatus( KMFolder* folder, const TQString& path, bool seen ); /** * The KIO-Slave died @@ -597,7 +597,7 @@ namespace KMail { /** * Emitted upon completion of the job for setting the status for a group of UIDs, - * as a result of a setImapStatus call. + * as a result of a setImaptqStatus call. * On error, if the user chooses abort (not continue), cont is set to false. */ void imapStatusChanged( KMFolder*, const TQString& imapPath, bool cont ); diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index 165811960..3ddb93f39 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -41,7 +41,7 @@ using KPIM::ProgressManager; #include "util.h" -#include <stylesheet.h> +#include <tqstylesheet.h> #include <kio/scheduler.h> #include <kdebug.h> #include <klocale.h> @@ -140,10 +140,10 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, for ( char *ch = cstr.data(); *ch; ch++ ) { if ( *ch == '\n' && (prevChar != '\r') ) { - jd.data.at( i ) = '\r'; + jd.data.tqat( i ) = '\r'; i++; } - jd.data.at( i ) = *ch; + jd.data.tqat( i ) = *ch; prevChar = *ch; i++; } @@ -191,7 +191,7 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, "ImapJobCopyMove"+ProgressManager::getUniqueID(), i18n("Server operation"), i18n("Source folder: %1 - Destination folder: %2") - .arg( TQStyleSheet::escape( msg_parent->prettyURL() ), + .tqarg( TQStyleSheet::escape( msg_parent->prettyURL() ), TQStyleSheet::escape( mDestFolder->prettyURL() ) ), true, account->useSSL() || account->useTLS() ); @@ -369,7 +369,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) { TQString errorStr = i18n( "Error while retrieving messages from the server." ); if ( (*it).progressItem ) - (*it).progressItem->seStatus( errorStr ); + (*it).progressItem->setqStatus( errorStr ); account->handleJobError( job, errorStr ); return; } else { @@ -540,12 +540,12 @@ void ImapJob::slotPutMessageResult( KIO::Job *job ) if (job->error()) { if ( (*it).progressItem ) - (*it).progressItem->seStatus( i18n("Uploading message data failed.") ); + (*it).progressItem->setqStatus( i18n("Uploading message data failed.") ); account->handlePutError( job, *it, mDestFolder ); return; } else { if ( (*it).progressItem ) - (*it).progressItem->seStatus( i18n("Uploading message data completed.") ); + (*it).progressItem->setqStatus( i18n("Uploading message data completed.") ); if ( mParentProgressItem ) { mParentProgressItem->incCompletedItems(); @@ -651,7 +651,7 @@ void ImapJob::slotCopyMessageResult( KIO::Job *job ) mErrorCode = job->error(); TQString errStr = i18n("Error while copying messages."); if ( (*it).progressItem ) - (*it).progressItem->seStatus( errStr ); + (*it).progressItem->setqStatus( errStr ); if ( account->handleJobError( job, errStr ) ) deleteLater(); return; diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp index 0cbc7cf8b..eeea23d78 100644 --- a/kmail/importarchivedialog.cpp +++ b/kmail/importarchivedialog.cpp @@ -27,7 +27,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> using namespace KMail; @@ -73,7 +73,7 @@ ImportArchiveDialog::ImportArchiveDialog( TQWidget *parent, TQt::WidgetFlags fla mainLayout->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Expanding ), row, 0 ); // Make it a bit bigger, else the folder requester cuts off the text too early - resize( 500, minimumSize().height() ); + resize( 500, tqminimumSize().height() ); } void ImportArchiveDialog::setFolder( KMFolder *defaultFolder ) diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index 574ed51f8..96ea86b5e 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -78,7 +78,7 @@ void KMail::ImportJob::finish() mProgressItem->setComplete(); mProgressItem = 0; TQString text = i18n( "Importing the archive file '%1' into the folder '%2' succeeded." ) - .arg( mArchiveFile.path() ).arg( mRootFolder->name() ); + .tqarg( mArchiveFile.path() ).tqarg( mRootFolder->name() ); text += "\n" + i18n( "1 message was imported.", "%n messages were imported.", mNumberOfImportedMessages ); KMessageBox::information( mParentWidget, text, i18n( "Import finished." ) ); deleteLater(); @@ -95,7 +95,7 @@ void KMail::ImportJob::abort( const TQString &errorMessage ) return; mAborted = true; - TQString text = i18n( "Failed to import the archive into folder '%1'." ).arg( mRootFolder->name() ); + TQString text = i18n( "Failed to import the archive into folder '%1'." ).tqarg( mRootFolder->name() ); text += "\n" + errorMessage; if ( mProgressItem ) { mProgressItem->setComplete(); @@ -111,7 +111,7 @@ KMFolder * KMail::ImportJob::createSubFolder( KMFolder *parent, const TQString & KMFolder *newFolder = FolderUtil::createSubFolder( parent, parent->child(), folderName, TQString(), KMFolderTypeMaildir ); if ( !newFolder ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parent->name() ) ); + abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parent->name() ) ); return 0; } else { @@ -207,11 +207,11 @@ void KMail::ImportJob::importNextMessage() } mCurrentFolder = folder; if ( mCurrentFolder->open( "ImportJob" ) != 0 ) { - abort( i18n( "Unable to open folder '%1'." ).arg( mCurrentFolder->name() ) ); + abort( i18n( "Unable to open folder '%1'." ).tqarg( mCurrentFolder->name() ) ); return; } kdDebug(5006) << "importNextMessage(): Current folder of queue is now: " << mCurrentFolder->name() << endl; - mProgressItem->seStatus( i18n( "Importing folder %1" ).arg( mCurrentFolder->name() ) ); + mProgressItem->setqStatus( i18n( "Importing folder %1" ).tqarg( mCurrentFolder->name() ) ); } mProgressItem->setProgress( ( mProgressItem->progress() + 5 ) ); @@ -221,7 +221,7 @@ void KMail::ImportJob::importNextMessage() messages.files.removeFirst(); mCurrentMessage = new KMMessage(); - mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* seStatus */ ); + mCurrentMessage->fromByteArray( mCurrentMessageFile->data(), true /* setqStatus */ ); int retIndex; // If this is not an IMAP folder, we can add the message directly. Otherwise, the whole thing is @@ -231,7 +231,7 @@ void KMail::ImportJob::importNextMessage() // uploaded. if ( mCurrentFolder->folderType() != KMFolderTypeImap ) { if ( mCurrentFolder->addMsg( mCurrentMessage, &retIndex ) != 0 ) { - abort( i18n( "Failed to add a message to the folder '%1'." ).arg( mCurrentFolder->name() ) ); + abort( i18n( "Failed to add a message to the folder '%1'." ).tqarg( mCurrentFolder->name() ) ); return; } messageAdded(); @@ -284,7 +284,7 @@ KMFolder* KMail::ImportJob::getOrCreateSubFolder( KMFolder *parentFolder, const mode_t subFolderPermissions ) { if ( !parentFolder->createChildFolder() ) { - abort( i18n( "Unable to create subfolder for folder '%1'." ).arg( parentFolder->name() ) ); + abort( i18n( "Unable to create subfolder for folder '%1'." ).tqarg( parentFolder->name() ) ); return 0; } @@ -334,7 +334,7 @@ void KMail::ImportJob::importNextDirectory() const TQString folderName = folderNameForDirectoryName( entry->name() ); if ( folderName.isEmpty() ) { - abort( i18n( "Unexpected subdirectory named '%1'." ).arg( entry->name() ) ); + abort( i18n( "Unexpected subdirectory named '%1'." ).tqarg( entry->name() ) ); return; } KMFolder *subFolder = getOrCreateSubFolder( currentFolder, folderName, entry->permissions() ); @@ -368,12 +368,12 @@ void KMail::ImportJob::start() else if ( !mimeType->patterns().grep( "zip", false ).isEmpty() ) mArchive = new KZip( mArchiveFile.path() ); else { - abort( i18n( "The file '%1' does not appear to be a valid archive." ).arg( mArchiveFile.path() ) ); + abort( i18n( "The file '%1' does not appear to be a valid archive." ).tqarg( mArchiveFile.path() ) ); return; } if ( !mArchive->open( IO_ReadOnly ) ) { - abort( i18n( "Unable to open archive file '%1'" ).arg( mArchiveFile.path() ) ); + abort( i18n( "Unable to open archive file '%1'" ).tqarg( mArchiveFile.path() ) ); return; } diff --git a/kmail/index.cpp b/kmail/index.cpp index bb1e2ac67..5604003d4 100644 --- a/kmail/index.cpp +++ b/kmail/index.cpp @@ -550,7 +550,7 @@ void KMMsgIndex::Search::act() { TQString terms; for ( KMSearchRule* rule = pat->first(); rule; rule = pat->next() ) { Q_ASSERT( rule->function() == KMSearchRule::FuncContains ); - terms += TQString::fromLatin1( " %1 " ).arg( rule->contents() ); + terms += TQString::tqfromLatin1( " %1 " ).tqarg( rule->contents() ); } mValues = kmkernel->msgIndex()->simpleSearch( terms, 0 ); diff --git a/kmail/kcursorsaver.h b/kmail/kcursorsaver.h index a4efe26de..3f6526d72 100644 --- a/kmail/kcursorsaver.h +++ b/kmail/kcursorsaver.h @@ -13,9 +13,9 @@ class KCursorSaver : public TQt { public: - /// constructor taking TQCursor shapes - KCursorSaver(TQt::CursorShape shape) { - TQApplication::setOverrideCursor( TQCursor(shape) ); + /// constructor taking TQCursor tqshapes + KCursorSaver(TQt::tqCursorShape tqshape) { + TQApplication::setOverrideCursor( TQCursor(tqshape) ); inited = true; } diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index a9f8dc6dc..c6abdd95e 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -308,7 +308,7 @@ static std::vector<GpgME::Key> trustedOrConfirmed( const std::vector<GpgME::Key> "for encryption.") : i18n("One or more of the OpenPGP encryption keys or S/MIME " "certificates for recipient \"%1\" is not fully trusted " - "for encryption.").arg(address) ; + "for encryption.").tqarg(address) ; if ( !fishies.empty() ) { // certificates can't have marginal trust @@ -651,7 +651,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expired less than a day ago.</p>", "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>" "<p>expired %n days ago.</p>", - daysSinceExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ), + daysSinceExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ), key.shortKeyID() ) : ( ca ? ( key.isRoot() @@ -698,7 +698,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>" "<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expired %n days ago.</p>", - daysSinceExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(), + daysSinceExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(), orig.issuerSerial(), Kleo::DN( key.userID(0).id() ).prettyDN() ) : ( mine ? sign @@ -716,7 +716,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expired less than a day ago.</p>", "<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expired %n days ago.</p>", - daysSinceExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(), + daysSinceExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(), key.issuerSerial() ) ); d->alreadyWarnedFingerprints.insert( subkey.fingerprint() ); if ( KMessageBox::warningContinueCancel( 0, msg, @@ -759,7 +759,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expires in less than a day.</p>", "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>" "<p>expires in less than %n days.</p>", - daysTillExpiry ) ).arg( TQString::fromUtf8( key.userID(0).id() ), + daysTillExpiry ) ).tqarg( TQString::fromUtf8( key.userID(0).id() ), key.shortKeyID() ) : ( ca ? ( key.isRoot() @@ -806,7 +806,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>" "<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expires in less than %n days.</p>", - daysTillExpiry ) ) ).arg( Kleo::DN( orig.userID(0).id() ).prettyDN(), + daysTillExpiry ) ) ).tqarg( Kleo::DN( orig.userID(0).id() ).prettyDN(), orig.issuerSerial(), Kleo::DN( key.userID(0).id() ).prettyDN() ) : ( mine ? sign @@ -824,7 +824,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons "<p>expires in less than a day.</p>", "<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number %2)</p>" "<p>expires in less than %n days.</p>", - daysTillExpiry ) ).arg( Kleo::DN( key.userID(0).id() ).prettyDN(), + daysTillExpiry ) ).tqarg( Kleo::DN( key.userID(0).id() ).prettyDN(), key.issuerSerial() ) ); d->alreadyWarnedFingerprints.insert( subkey.fingerprint() ); if ( KMessageBox::warningContinueCancel( 0, msg, @@ -1628,7 +1628,7 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p "There is a problem with the " "encryption certificate(s) for \"%1\".\n\n" "Please re-select the certificate(s) which should " - "be used for this recipient.").arg(person), + "be used for this recipient.").tqarg(person), keys ); } bool canceled = false; @@ -1680,13 +1680,13 @@ std::vector<GpgME::Key> Kleo::KeyResolver::getEncryptionKeys( const TQString & p "Select the certificate(s) which should " "be used for this recipient. If there is no suitable certificate in the list " "you can also search for external certificates by clicking the button: search for external certificates.</qt>") - .arg( TQStyleSheet::escape(person) ) + .tqarg( TQStyleSheet::escape(person) ) : i18n("if in your language something like " "'certificate(s)' isn't possible please " "use the plural in the translation", "More than one certificate matches \"%1\".\n\n" "Select the certificate(s) which should " - "be used for this recipient.").arg( TQStyleSheet::escape(person) ), + "be used for this recipient.").tqarg( TQStyleSheet::escape(person) ), matchingKeys ), address, canceled ); // we can ignore 'canceled' here, since trustedOrConfirmed() returns // an empty vector when canceled == true, and we'd just do the same @@ -1797,7 +1797,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont KABC::Addressee addr; if ( res.isEmpty() ) { bool ok = true; - TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok ); + TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).tqarg( email ), TQString(), &ok ); if ( ok ) { addr.setNameFromString( fullName ); addr.insertEmail( email, true ); diff --git a/kmail/khtmlparthtmlwriter.cpp b/kmail/khtmlparthtmlwriter.cpp index 3c8ee388d..2b53e6094 100644 --- a/kmail/khtmlparthtmlwriter.cpp +++ b/kmail/khtmlparthtmlwriter.cpp @@ -86,7 +86,7 @@ namespace KMail { mHtmlPart->view()->viewport()->setUpdatesEnabled( true ); mHtmlPart->view()->setUpdatesEnabled( true ); - mHtmlPart->view()->viewport()->repaint( false ); + mHtmlPart->view()->viewport()->tqrepaint( false ); mState = Ended; } diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp index e5e6619ba..7027edd6d 100644 --- a/kmail/klistboxdialog.cpp +++ b/kmail/klistboxdialog.cpp @@ -6,7 +6,7 @@ #include "klistboxdialog.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> KListBoxDialog::KListBoxDialog( TQString& _selectedString, const TQString& caption, diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 9ffec93e2..7cadcba97 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -46,7 +46,7 @@ KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) : TQObject(parent), mPrecommand(precommand) { BroadcastStatus::instance()->seStatusMsg( - i18n("Executing precommand %1").arg(precommand )); + i18n("Executing precommand %1").tqarg(precommand )); mPrecommandProcess.setUseShell(true); mPrecommandProcess << precommand; @@ -66,7 +66,7 @@ bool KMPrecommand::start() { bool ok = mPrecommandProcess.start( KProcess::NotifyOnExit ); if (!ok) KMessageBox::error(0, i18n("Could not execute precommand '%1'.") - .arg(mPrecommand)); + .tqarg(mPrecommand)); return ok; } @@ -77,7 +77,7 @@ void KMPrecommand::precommandExited(KProcess *p) int exitCode = p->normalExit() ? p->exitStatus() : -1; if (exitCode) KMessageBox::error(0, i18n("The precommand exited with code %1:\n%2") - .arg(exitCode).arg(strerror(exitCode))); + .tqarg(exitCode).tqarg(strerror(exitCode))); emit finished(!exitCode); } @@ -233,10 +233,10 @@ bool KMAccount::processNewMsg(KMMessage* aMsg) // This is only valid for pop accounts and produces wrong stati for imap. if ( type() != "cachedimap" && type() != "imap" ) { if ( aMsg->isOld() ) - aMsg->seStatus(KMMsgStatusUnread); // -sanders - // aMsg->seStatus(KMMsgStatusRead); + aMsg->setqStatus(KMMsgStatusUnread); // -sanders + // aMsg->setqStatus(KMMsgStatusRead); else - aMsg->seStatus(KMMsgStatusNew); + aMsg->setqStatus(KMMsgStatusNew); } /* TQFile fileD0( "testdat_xx-kmaccount-0" ); @@ -378,7 +378,7 @@ bool KMAccount::runPrecommand(const TQString &precommand) KMPrecommand precommandProcess(precommand, this); BroadcastStatus::instance()->seStatusMsg( - i18n("Executing precommand %1").arg(precommand )); + i18n("Executing precommand %1").tqarg(precommand )); connect(&precommandProcess, TQT_SIGNAL(finished(bool)), TQT_SLOT(precommandExited(bool))); @@ -426,9 +426,9 @@ TQString KMAccount::encryptStr(const TQString &aStr) TQString result; for (uint i = 0; i < aStr.length(); i++) /* yes, no typo. can't encode ' ' or '!' because - they're the unicode BOM. stupid scrambling. stupid. */ - result += (aStr[i].unicode() <= 0x21 ) ? aStr[i] : - TQChar(0x1001F - aStr[i].unicode()); + they're the tqunicode BOM. stupid scrambling. stupid. */ + result += (aStr[i].tqunicode() <= 0x21 ) ? aStr[i] : + TQChar(0x1001F - aStr[i].tqunicode()); return result; } @@ -470,7 +470,7 @@ void KMAccount::pseudoAssign( const KMAccount * a ) { } //----------------------------------------------------------------------------- -void KMAccount::checkDone( bool newmail, CheckStatus status ) +void KMAccount::checkDone( bool newmail, ChecktqStatus status ) { setCheckingMail( false ); // Reset the timeout for automatic mailchecking. The user might have diff --git a/kmail/kmaccount.h b/kmail/kmaccount.h index 1c12042bc..43f3aca3a 100644 --- a/kmail/kmaccount.h +++ b/kmail/kmaccount.h @@ -83,7 +83,7 @@ class KMAccount: public TQObject, public KAccount public: virtual ~KMAccount(); - enum CheckStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted, + enum ChecktqStatus { CheckOK, CheckIgnored, CheckCanceled, CheckAborted, CheckError }; /** The default check interval */ @@ -208,7 +208,7 @@ public: virtual void setHasInbox( bool has ) { mHasInbox = has; } /** - * If this account is a disconnected IMAP account, invalidate it. + * If this account is a disconnected IMAP account, tqinvalidate it. */ virtual void invalidateIMAPFolders(); @@ -231,7 +231,7 @@ public: * @param newMail true if new mail arrived * @param status the status of the mail check */ - void checkDone( bool newMail, CheckStatus status ); + void checkDone( bool newMail, ChecktqStatus status ); /** * Abort all running mail checks. Used when closing the last KMMainWin. @@ -260,7 +260,7 @@ signals: * @param newMail true if there was new mail * @param status the status of the mail check **/ - virtual void finishedCheck( bool newMail, CheckStatus status ); + virtual void finishedCheck( bool newMail, ChecktqStatus status ); /** * Emitted after the mail check is finished. diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp index 8f2efd89c..9066941c6 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/kmail/kmacctcachedimap.cpp @@ -53,7 +53,7 @@ using KMail::AccountManager; #include <kapplication.h> #include <kconfig.h> -#include <stylesheet.h> +#include <tqstylesheet.h> KMAcctCachedImap::KMAcctCachedImap( AccountManager* aOwner, const TQString& aAccountName, uint id ) @@ -186,7 +186,7 @@ void KMAcctCachedImap::slotCheckQueuedFolders() mMailCheckFolders.append( mFoldersQueuedForChecking.front() ); mFoldersQueuedForChecking.pop_front(); if ( mFoldersQueuedForChecking.isEmpty() ) - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckQueuedFolders() ) ); kmkernel->acctMgr()->singleCheckMail(this, true); diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index cac848937..fe74bc80a 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -50,7 +50,7 @@ using KPIM::ProgressManager; #include <kmessagebox.h> #include <kdebug.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <errno.h> @@ -69,7 +69,7 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin connect(&mErrorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotResetConnectionError())); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + - TQString("%1").arg(KAccount::id()) ); + TQString("%1").tqarg(KAccount::id()) ); KConfig config( serNumUri ); TQStringList serNums = config.readListEntry( "unfiltered" ); mFilterSerNumsToSave.setAutoDelete( false ); @@ -88,7 +88,7 @@ KMAcctImap::~KMAcctImap() killAllJobs( true ); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + - TQString("%1").arg(KAccount::id()) ); + TQString("%1").tqarg(KAccount::id()) ); KConfig config( serNumUri ); TQStringList serNums; TQDictIterator<int> it( mFilterSerNumsToSave ); @@ -297,7 +297,7 @@ void KMAcctImap::processNewMail(bool interactive) mMailCheckProgressItem = ProgressManager::createProgressItem( "MailCheckAccount" + name(), - i18n("Checking account: %1" ).arg( TQStyleSheet::escape( name() ) ), + i18n("Checking account: %1" ).tqarg( TQStyleSheet::escape( name() ) ), TQString(), // status true, // can be canceled useSSL() || useTLS() ); @@ -395,7 +395,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if ( mMailCheckProgressItem ) { mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->seStatus( folder->prettyURL() + i18n(" completed") ); + mMailCheckProgressItem->setqStatus( folder->prettyURL() + i18n(" completed") ); } mCountRemainChecks--; @@ -434,7 +434,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) // It's possible that the message has been deleted or moved into a // different folder, or that the serNum is stale if ( !folder ) { - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); ++filterIt; continue; } @@ -443,7 +443,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if (!imapFolder || !imapFolder->folder()->isSystemFolder() || !(imapFolder->imapPath() == "/INBOX/") ) { // sanity checking - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); ++filterIt; continue; } @@ -452,7 +452,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) msg = folder->getMsg( idx ); if (!msg) { // sanity checking - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); ++filterIt; continue; } @@ -473,7 +473,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) TQT_SLOT(slotFilterMsg(KMMessage*))); job->start(); } else { - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( *filterIt ) ); if (slotFilterMsg(msg) == 2) break; } } @@ -488,8 +488,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) mCountLastUnread = 0; // => mCountUnread - mCountLastUnread == new count // when we check only one folder (=selected) and we have new mails // then do not display a summary as the normal status message is better - bool showStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true; - ImapAccountBase::postProcessNewMail( showStatus ); + bool showtqStatus = ( mCheckingSingleFolder && mCountUnread > 0 ) ? false : true; + ImapAccountBase::postProcessNewMail( showtqStatus ); mUnreadBeforeCheck.clear(); mCheckingSingleFolder = false; } @@ -498,7 +498,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) //----------------------------------------------------------------------------- void KMAcctImap::slotFiltered(TQ_UINT32 serNum) { - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) ); } //----------------------------------------------------------------------------- @@ -584,7 +584,7 @@ void KMAcctImap::execFilters(TQ_UINT32 serNum) if ( findIt != mFilterSerNums.end() ) return; mFilterSerNums.append( serNum ); - mFilterSerNumsToSave.insert( TQString( "%1" ).arg( serNum ), (const int *)1 ); + mFilterSerNumsToSave.insert( TQString( "%1" ).tqarg( serNum ), (const int *)1 ); } int KMAcctImap::slotFilterMsg( KMMessage *msg ) @@ -596,7 +596,7 @@ int KMAcctImap::slotFilterMsg( KMMessage *msg ) msg->setTransferInProgress(false); TQ_UINT32 serNum = msg->getMsgSerNum(); if ( serNum ) - mFilterSerNumsToSave.remove( TQString( "%1" ).arg( serNum ) ); + mFilterSerNumsToSave.remove( TQString( "%1" ).tqarg( serNum ) ); int filterResult = kmkernel->filterMgr()->process(msg, KMFilterMgr::Inbound, diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp index 67cc7d4b4..88424e13e 100644 --- a/kmail/kmacctlocal.cpp +++ b/kmail/kmacctlocal.cpp @@ -21,7 +21,7 @@ using KPIM::ProgressManager; #include <kconfig.h> #include <tqfileinfo.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <stdlib.h> #include <stdio.h> @@ -125,7 +125,7 @@ bool KMAcctLocal::preProcess() //BroadcastStatus::instance()->reset(); BroadcastStatus::instance()->seStatusMsg( - i18n("Preparing transmission from \"%1\"...").arg(mName)); + i18n("Preparing transmission from \"%1\"...").tqarg(mName)); Q_ASSERT( !mMailCheckProgressItem ); @@ -133,7 +133,7 @@ bool KMAcctLocal::preProcess() mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + mName, escapedName, - i18n("Preparing transmission from \"%1\"...").arg( escapedName ), + i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ), false, // cannot be canceled false ); // no tls/ssl @@ -164,7 +164,7 @@ bool KMAcctLocal::preProcess() mMailFolder->close("acctlocalMail"); checkDone( mHasNewMail, CheckError ); TQString errMsg = i18n( "Transmission failed: Could not lock %1." ) - .arg( mMailFolder->location() ); + .tqarg( mMailFolder->location() ); BroadcastStatus::instance()->seStatusMsg( errMsg ); return false; } @@ -177,7 +177,7 @@ bool KMAcctLocal::preProcess() // prepare the static parts of the status message: mStatusMsgStub = i18n("Moving message %3 of %2 from %1.") - .arg(mMailFolder->location()).arg( mNumMsgs ); + .tqarg(mMailFolder->location()).tqarg( mNumMsgs ); //BroadcastStatus::instance()->seStatusProgressEnable( "L" + mName, true ); return true; @@ -192,11 +192,11 @@ bool KMAcctLocal::fetchMsg() /* This causes mail eating if (kmkernel->mailCheckAborted()) break; */ - const TQString statusMsg = mStatusMsgStub.arg( mMsgsFetched ); + const TQString statusMsg = mStatusMsgStub.tqarg( mMsgsFetched ); //BroadcastStatus::instance()->seStatusMsg( statusMsg ); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->seStatus( statusMsg ); + mMailCheckProgressItem->setqStatus( statusMsg ); msg = mMailFolder->take(0); if (msg) @@ -214,7 +214,7 @@ bool KMAcctLocal::fetchMsg() fileD0.close(); // If data is 0 we just create a zero length file. } #endif - msg->seStatus(msg->headerField("Status").latin1(), + msg->setqStatus(msg->headerField("Status").latin1(), msg->headerField("X-Status").latin1()); msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) ); msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0)); @@ -244,16 +244,16 @@ void KMAcctLocal::postProcess() KMessageBox::queuedMessageBox( 0, KMessageBox::Information, i18n( "<qt>Cannot remove mail from " "mailbox <b>%1</b>:<br>%2</qt>" ) - .arg( mMailFolder->location() ) - .arg( strerror( rc ) ) ); + .tqarg( mMailFolder->location() ) + .tqarg( strerror( rc ) ) ); } if( mMailCheckProgressItem ) { // do this only once... BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( mName, mNumMsgs ); - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from mailbox %1.", "Fetched %n messages from mailbox %1.", - mNumMsgs ).arg( mMailFolder->location() ) ); + mNumMsgs ).tqarg( mMailFolder->location() ) ); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; } diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index a65ba6bbb..818e614d0 100644 --- a/kmail/kmacctmaildir.cpp +++ b/kmail/kmacctmaildir.cpp @@ -19,7 +19,7 @@ using KPIM::ProgressManager; #include <kdebug.h> #include <kconfig.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <stdlib.h> #include <stdio.h> @@ -107,14 +107,14 @@ void KMAcctMaildir::processNewMail(bool) } BroadcastStatus::instance()->seStatusMsg( - i18n("Preparing transmission from \"%1\"...").arg(mName)); + i18n("Preparing transmission from \"%1\"...").tqarg(mName)); Q_ASSERT( !mMailCheckProgressItem ); TQString escapedName = TQStyleSheet::escape( mName ); mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + mName, escapedName, - i18n("Preparing transmission from \"%1\"...").arg( escapedName ), + i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ), false, // cannot be canceled false ); // no tls/ssl @@ -130,7 +130,7 @@ void KMAcctMaildir::processNewMail(bool) rc = mailFolder.open("acctmaildirMail"); if (rc) { - TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").arg( mailFolder.location() ); + TQString aStr = i18n("<qt>Cannot open folder <b>%1</b>.</qt>").tqarg( mailFolder.location() ); KMessageBox::sorry(0, aStr); kdDebug(5006) << "cannot open folder " << mailFolder.location() << endl; checkDone( hasNewMail, CheckError ); @@ -148,7 +148,7 @@ void KMAcctMaildir::processNewMail(bool) // prepare the static parts of the status message: TQString statusMsgStub = i18n("Moving message %3 of %2 from %1.") - .arg(mailFolder.location()).arg(num); + .tqarg(mailFolder.location()).tqarg(num); mMailCheckProgressItem->setTotalItems( num ); @@ -162,15 +162,15 @@ void KMAcctMaildir::processNewMail(bool) } if (!addedOk) break; - TQString statusMsg = statusMsgStub.arg(i); + TQString statusMsg = statusMsgStub.tqarg(i); mMailCheckProgressItem->incCompletedItems(); mMailCheckProgressItem->updateProgress(); - mMailCheckProgressItem->seStatus( statusMsg ); + mMailCheckProgressItem->setqStatus( statusMsg ); msg = mailFolder.take(0); if (msg) { - msg->seStatus(msg->headerField("Status").latin1(), + msg->setqStatus(msg->headerField("Status").latin1(), msg->headerField("X-Status").latin1()); msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0)); msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0)); @@ -189,10 +189,10 @@ void KMAcctMaildir::processNewMail(bool) if( mMailCheckProgressItem ) { // do this only once... BroadcastStatus::instance()->seStatusMsgTransmissionCompleted( num ); - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from maildir folder %1.", "Fetched %n messages from maildir folder %1.", - num ).arg(mailFolder.location() ) ); + num ).tqarg(mailFolder.location() ) ); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp index 327689ddf..44df37c61 100644 --- a/kmail/kmacctseldlg.cpp +++ b/kmail/kmacctseldlg.cpp @@ -25,7 +25,7 @@ #endif #include <tqbuttongroup.h> -#include <layout.h> +#include <tqlayout.h> #include <tqradiobutton.h> #include <klocale.h> diff --git a/kmail/kmail.antispamrc b/kmail/kmail.antispamrc index 098f80c26..2bef9ad09 100644 --- a/kmail/kmail.antispamrc +++ b/kmail/kmail.antispamrc @@ -20,7 +20,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=0 ScoreName=Spamassassin -ScoreHeader=X-Spam-Status +ScoreHeader=X-Spam-tqStatus ScoreType=Adjusted ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.] ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.] @@ -139,7 +139,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=0 ScoreName=Spamassassin -ScoreHeader=X-Spam-Status +ScoreHeader=X-Spam-tqStatus ScoreType=Adjusted ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.] ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.] @@ -163,7 +163,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=0 ScoreName=Spamassassin -ScoreHeader=X-Spam-Status +ScoreHeader=X-Spam-tqStatus ScoreType=Adjusted ScoreValueRegexp=(?:hits|score)=([\d\.-]+)[^\d\.] ScoreThresholdRegexp=required=([\d\.-]+)[^\d\.] @@ -222,7 +222,7 @@ PipeFilterName=CRM114 Check PipeCmdDetect=crm -u $HOME/.crm114 mailreaver.crm ExecCmdSpam=crm -u $HOME/.crm114 mailreaver.crm --spam ExecCmdHam=crm -u $HOME/.crm114 mailreaver.crm --good -DetectionHeader=X-CRM114-Status +DetectionHeader=X-CRM114-tqStatus DetectionPattern=SPAM DetectionPattern2=UNSURE DetectionOnly=0 @@ -230,7 +230,7 @@ UseRegExp=0 SupportsBayes=1 SupportsUnsure=1 ScoreName=CRM114 -ScoreHeader=X-CRM114-Status +ScoreHeader=X-CRM114-tqStatus ScoreType=Bool ScoreValueRegexp=SPAM ScoreThresholdRegexp= diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg index 5441da643..b2cd4d39e 100644 --- a/kmail/kmail.kcfg +++ b/kmail/kmail.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <include>textcodec.h</include> + <include>tqtextcodec.h</include> <include>kapplication.h</include> <kcfgfile name="kmailrc"/> <group name="Behaviour"> @@ -561,10 +561,10 @@ <default>true</default> </entry> <entry name="ForegroundColor" type="Color" key="ForegroundColor"> - <default code="true">kapp->palette().active().text()</default> + <default code="true">kapp->tqpalette().active().text()</default> </entry> <entry name="BackgroundColor" type="Color" key="BackgroundColor"> - <default code="true">kapp->palette().active().base()</default> + <default code="true">kapp->tqpalette().active().base()</default> </entry> <entry name="FallbackCharacterEncoding" type="String" key="FallbackCharacterEncoding"> <default code="true"> TQCString(TQTextCodec::codecForLocale()->name()).lower() == "eucjp"? TQCString("jis7") : TQCString(TQTextCodec::codecForLocale()->name()).lower()</default> diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index bd0fbec87..452f3fe43 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -54,7 +54,7 @@ using KRecentAddress::RecentAddresses; #include <ksettings/dispatcher.h> -#include <layout.h> +#include <tqlayout.h> typedef KParts::GenericFactory< KMailPart > KMailFactory; @@ -223,7 +223,7 @@ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e) mainWidget->initializeFilterActions(); mainWidget->initializeFolderShortcutActions(); mainWidget->setupForwardingActionsList(); - mainWidget->updateVactionScripStatus(); + mainWidget->updateVactionScriptqStatus(); } void KMailPart::exit() diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index a27bf2a66..1376932e0 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -63,7 +63,7 @@ using KMail::AccountManager; #include <tqfile.h> #include <tqmap.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <kdebug.h> #include <kiconloader.h> @@ -671,19 +671,19 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) } TQString label = folder->prettyURL(); - TQStringList parts = TQStringList::split( TQString::fromLatin1("/"), label ); + TQStringList parts = TQStringList::split( TQString::tqfromLatin1("/"), label ); // In the common special case of some other user's folder shared with us // the url looks like "Server Name/user/$USERNAME/Folder/Name". Make // those a bit nicer. - if ( parts[1] == TQString::fromLatin1("user") ) { + if ( parts[1] == TQString::tqfromLatin1("user") ) { TQStringList remainder(parts); remainder.pop_front(); remainder.pop_front(); remainder.pop_front(); label = i18n("%1's %2") - .arg( parts[2] ) - .arg( remainder.join( TQString::fromLatin1("/") ) ); + .tqarg( parts[2] ) + .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); } // Another special case is our own folders, under the imap INBOX, make // those prettier too @@ -698,15 +698,15 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) // Fix kolab issue 2531 folder->storage() )->account() can be null if( folder->storage() && static_cast<const KMFolderCachedImap*>( folder->storage() )->account() ) { label = i18n( "My %1 (%2)") - .arg( remainder.join( TQString::fromLatin1("/") ), + .tqarg( remainder.join( TQString::tqfromLatin1("/") ), static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() ); } else { label = i18n("My %1") - .arg( remainder.join( TQString::fromLatin1("/") ) ); + .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); } } else { label = i18n("My %1") - .arg( remainder.join( TQString::fromLatin1("/") ) ); + .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); } break; } @@ -1311,33 +1311,33 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag GroupwarePage in configuredialog.cpp */ // English - folderNames[0][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendar"); - folderNames[0][KFolderTreeItem::Tasks] = TQString::fromLatin1("Tasks"); - folderNames[0][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal"); - folderNames[0][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts"); - folderNames[0][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes"); + folderNames[0][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendar"); + folderNames[0][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Tasks"); + folderNames[0][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal"); + folderNames[0][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts"); + folderNames[0][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes"); // German - folderNames[1][KFolderTreeItem::Calendar] = TQString::fromLatin1("Kalender"); - folderNames[1][KFolderTreeItem::Tasks] = TQString::fromLatin1("Aufgaben"); - folderNames[1][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal"); - folderNames[1][KFolderTreeItem::Contacts] = TQString::fromLatin1("Kontakte"); - folderNames[1][KFolderTreeItem::Notes] = TQString::fromLatin1("Notizen"); + folderNames[1][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Kalender"); + folderNames[1][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Aufgaben"); + folderNames[1][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal"); + folderNames[1][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Kontakte"); + folderNames[1][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notizen"); // French - folderNames[2][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendrier"); + folderNames[2][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendrier"); // Tasks = Tâches (â == 0xE2 in latin1) - folderNames[2][KFolderTreeItem::Tasks] = TQString::fromLatin1("T\342ches"); - folderNames[2][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal"); - folderNames[2][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts"); - folderNames[2][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes"); + folderNames[2][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("T\342ches"); + folderNames[2][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal"); + folderNames[2][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts"); + folderNames[2][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes"); // Dutch - folderNames[3][KFolderTreeItem::Calendar] = TQString::fromLatin1("Agenda"); - folderNames[3][KFolderTreeItem::Tasks] = TQString::fromLatin1("Taken"); - folderNames[3][KFolderTreeItem::Journals] = TQString::fromLatin1("Logboek"); - folderNames[3][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contactpersonen"); - folderNames[3][KFolderTreeItem::Notes] = TQString::fromLatin1("Notities"); + folderNames[3][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Agenda"); + folderNames[3][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Taken"); + folderNames[3][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Logboek"); + folderNames[3][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contactpersonen"); + folderNames[3][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notities"); } if( language < 0 || language > 3 ) { @@ -1574,7 +1574,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL ) kdWarning() << "KCal::ResourceKolab::fromKMailFolderSynced path is too short: " << path << endl; return; } - if ( path.startsWith( "/INBOX/", false ) ) { + if ( path.tqstartsWith( "/INBOX/", false ) ) { // If INBOX, replace it with the username (which is user@domain) path = path.mid( secondSlash ); path.prepend( folderURL.user() ); @@ -1717,9 +1717,9 @@ void KMailICalIfaceImpl::readConfig() Q_ASSERT( account ); if ( account ) { // just in case we were connected already - disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); - connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + connect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); } mUseResourceIMAP = false; @@ -1776,7 +1776,7 @@ void KMailICalIfaceImpl::readConfig() // No subfolder was found, so ask if we can make them msg = i18n("KMail will now create the required groupware folders" " as subfolders of %1; if you do not want this, cancel" - " and the IMAP resource will be disabled").arg(parentFolderName); + " and the IMAP resource will be disabled").tqarg(parentFolderName); } else { // Some subfolders were found, be more precise TQString operations = "<ul>"; @@ -1784,17 +1784,17 @@ void KMailICalIfaceImpl::readConfig() if ( i != KMail::ContentsTypeMail ) { TQString typeName = localizedDefaultFolderName( static_cast<KMail::FolderContentsType>( i ) ); if ( results[i].found == StandardFolderSearchResult::NotFound ) - operations += "<li>" + i18n( "%1: no folder found. It will be created." ).arg( typeName ) + "</li>"; + operations += "<li>" + i18n( "%1: no folder found. It will be created." ).tqarg( typeName ) + "</li>"; else if ( results[i].found == StandardFolderSearchResult::FoundByType || results[i].found == StandardFolderSearchResult::FoundByName ) operations += "<li>" + i18n( "%1: found folder %2. It will be set as the main groupware folder." ). - arg( typeName ).arg( results[i].folder->label() ) + "</li>"; + tqarg( typeName ).tqarg( results[i].folder->label() ) + "</li>"; } } operations += "</ul>"; msg = i18n("<qt>KMail found the following groupware folders in %1 and needs to perform the following operations: %2" "<br>If you do not want this, cancel" - " and the IMAP resource will be disabled").arg(parentFolderName, operations); + " and the IMAP resource will be disabled").tqarg(parentFolderName, operations); } @@ -1966,7 +1966,7 @@ void KMailICalIfaceImpl::slotCheckDone() { KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() ); if ( account ) - disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), + disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); readConfig(); } @@ -1991,7 +1991,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType labels << (*it)->prettyURL(); const TQString selected = KInputDialog::getItem( i18n("Default folder"), i18n("There are multiple %1 default folders, please choose one:") - .arg( localizedDefaultFolderName( contentsType ) ), labels ); + .tqarg( localizedDefaultFolderName( contentsType ) ), labels ); if ( !selected.isEmpty() ) result.folder = result.folders[ labels.findIndex( selected ) ]; } @@ -2017,7 +2017,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType if( folder->canAccess() != 0 ) { KMessageBox::sorry(0, i18n("You do not have read/write permission to your %1 folder.") - .arg( folderName( itemType ) ) ); + .tqarg( folderName( itemType ) ) ); return 0; } folder->storage()->setContentsType( contentsType ); @@ -2139,15 +2139,15 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const return TQString(); if( type == KFolderTreeItem::Contacts ) - return TQString::fromLatin1( "kmgroupware_folder_contacts" ); + return TQString::tqfromLatin1( "kmgroupware_folder_contacts" ); else if( type == KFolderTreeItem::Calendar ) - return TQString::fromLatin1( "kmgroupware_folder_calendar" ); + return TQString::tqfromLatin1( "kmgroupware_folder_calendar" ); else if( type == KFolderTreeItem::Notes ) - return TQString::fromLatin1( "kmgroupware_folder_notes" ); + return TQString::tqfromLatin1( "kmgroupware_folder_notes" ); else if( type == KFolderTreeItem::Tasks ) - return TQString::fromLatin1( "kmgroupware_folder_tasks" ); + return TQString::tqfromLatin1( "kmgroupware_folder_tasks" ); else if( type == KFolderTreeItem::Journals ) - return TQString::fromLatin1( "kmgroupware_folder_journals" ); + return TQString::tqfromLatin1( "kmgroupware_folder_journals" ); return TQString(); } diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp index 4d9fc42df..d1300f840 100644 --- a/kmail/kmatmlistview.cpp +++ b/kmail/kmatmlistview.cpp @@ -52,9 +52,9 @@ void KMAtmListViewItem::updateCheckBox( int headerSection, TQCheckBox *cb ) //Set the correct background color TQColor bg; if ( isSelected() ) { - bg = listView()->colorGroup().highlight(); + bg = listView()->tqcolorGroup().highlight(); } else { - bg = listView()->colorGroup().base(); + bg = listView()->tqcolorGroup().base(); } cb->setPaletteBackgroundColor( bg ); } diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 2a0713c77..19661be97 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -54,7 +54,7 @@ #include <kapplication.h> #include <dcopclient.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqpopupmenu.h> #include <tqeventloop.h> @@ -133,7 +133,7 @@ using namespace KMime; #include <kleo/cryptobackend.h> #include <kleo/cryptobackendfactory.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <memory> @@ -537,7 +537,7 @@ KMAddBookmarksCommand::KMAddBookmarksCommand( const KURL &url, TQWidget *parent KMCommand::Result KMAddBookmarksCommand::execute() { - TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") ); + TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") ); KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename, false ); KBookmarkGroup group = bookManager->root(); @@ -586,7 +586,7 @@ KMUrlCopyCommand::KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget ) KMCommand::Result KMUrlCopyCommand::execute() { - TQClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); if (mUrl.protocol() == "mailto") { // put the url into the mouse selection and the clipboard @@ -640,7 +640,7 @@ KMCommand::Result KMUrlSaveCommand::execute() { if (KMessageBox::warningContinueCancel(0, i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>") - .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .tqarg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) != KMessageBox::Continue) return Canceled; } @@ -753,8 +753,8 @@ KMCommand::Result KMShowMsgSrcCommand::execute() viewer->resize(TQApplication::desktop()->screenGeometry(scnum).width()/2, 2*TQApplication::desktop()->screenGeometry(scnum).height()/3); } else { - viewer->resize(TQApplication::desktop()->geometry().width()/2, - 2*TQApplication::desktop()->geometry().height()/3); + viewer->resize(TQApplication::desktop()->tqgeometry().width()/2, + 2*TQApplication::desktop()->tqgeometry().height()/3); } viewer->show(); @@ -963,7 +963,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job) { if (KMessageBox::warningContinueCancel(0, i18n("File %1 exists.\nDo you want to replace it?") - .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .tqarg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) { mOffset = 0; @@ -1395,14 +1395,14 @@ KMCommand::Result KMForwardDigestCommand::execute() id = msg->headerField( "X-KMail-Identity" ).stripWhiteSpace().toUInt(); // set the part header msgPartText += "--"; - msgPartText += TQString::fromLatin1( boundary ); + msgPartText += TQString::tqfromLatin1( boundary ); msgPartText += "\nContent-Type: MESSAGE/RFC822"; - msgPartText += TQString( "; CHARSET=%1" ).arg( TQString(msg->charset()) ); + msgPartText += TQString( "; CHARSET=%1" ).tqarg( TQString(msg->charset()) ); msgPartText += '\n'; DwHeaders dwh; dwh.MessageId().CreateDefault(); - msgPartText += TQString( "Content-ID: %1\n" ).arg( dwh.MessageId().AsString().c_str() ); - msgPartText += TQString( "Content-Description: %1" ).arg( msg->subject() ); + msgPartText += TQString( "Content-ID: %1\n" ).tqarg( dwh.MessageId().AsString().c_str() ); + msgPartText += TQString( "Content-Description: %1" ).tqarg( msg->subject() ); if ( !msg->subject().contains( "(fwd)" ) ) msgPartText += " (fwd)"; msgPartText += "\n\n"; @@ -1422,7 +1422,7 @@ KMCommand::Result KMForwardDigestCommand::execute() id = mIdentity; // use folder identity if no message had an id set fwdMsg->initHeader( id ); msgPartText += "--"; - msgPartText += TQString::fromLatin1( boundary ); + msgPartText += TQString::tqfromLatin1( boundary ); msgPartText += "--\n"; TQCString tmp; msgPart->setTypeStr( "MULTIPART" ); @@ -1430,7 +1430,7 @@ KMCommand::Result KMForwardDigestCommand::execute() msgPart->setSubtypeStr( tmp ); msgPart->setName( "unnamed" ); msgPart->setCte( DwMime::kCte7bit ); // does it have to be 7bit? - msgPart->setContentDescription( TQString( "Digest of %1 messages." ).arg( msgCnt ) ); + msgPart->setContentDescription( TQString( "Digest of %1 messages." ).tqarg( msgCnt ) ); // THIS HAS TO BE AFTER setCte()!!!! msgPart->setBodyEncoded( TQCString( msgPartText.ascii() ) ); KCursorSaver busy( KBusyPtr::busy() ); @@ -1639,9 +1639,9 @@ KMCommand::Result KMPrintCommand::execute() } -KMSeStatusCommand::KMSeStatusCommand( KMMsgStatus status, +KMSeStatusCommand::KMSeStatusCommand( KMMsgtqStatus status, const TQValueList<TQ_UINT32> &serNums, bool toggle ) - : mStatus( status ), mSerNums( serNums ), mToggle( toggle ) + : mtqStatus( status ), mSerNums( serNums ), mToggle( toggle ) { } @@ -1650,7 +1650,7 @@ KMCommand::Result KMSeStatusCommand::execute() TQValueListIterator<TQ_UINT32> it; int idx = -1; KMFolder *folder = 0; - bool parenStatus = false; + bool parentqStatus = false; // Toggle actions on threads toggle the whole thread // depending on the state of the parent. @@ -1659,10 +1659,10 @@ KMCommand::Result KMSeStatusCommand::execute() KMMsgDict::instance()->getLocation( *mSerNums.begin(), &folder, &idx ); if (folder) { msg = folder->getMsgBase(idx); - if (msg && (msg->status()&mStatus)) - parenStatus = true; + if (msg && (msg->status()&mtqStatus)) + parentqStatus = true; else - parenStatus = false; + parentqStatus = false; } } TQMap< KMFolder*, TQValueList<int> > folderMap; @@ -1673,12 +1673,12 @@ KMCommand::Result KMSeStatusCommand::execute() KMMsgBase *msg = folder->getMsgBase(idx); // check if we are already at the target toggle state if (msg) { - bool myStatus; - if (msg->status()&mStatus) - myStatus = true; + bool mytqStatus; + if (msg->status()&mtqStatus) + mytqStatus = true; else - myStatus = false; - if (myStatus != parenStatus) + mytqStatus = false; + if (mytqStatus != parentqStatus) continue; } } @@ -1690,7 +1690,7 @@ KMCommand::Result KMSeStatusCommand::execute() TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin(); while ( it2 != folderMap.end() ) { KMFolder *f = it2.key(); - f->seStatus( (*it2), mStatus, mToggle ); + f->setqStatus( (*it2), mtqStatus, mToggle ); ++it2; } //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); @@ -1741,7 +1741,7 @@ KMCommand::Result KMFilterActionCommand::execute() if ( diff < 10 || !( msgCount % 20 ) || msgCount <= 10 ) { progressItem->updateProgress(); TQString statusMsg = i18n("Filtering message %1 of %2"); - statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); + statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter ); KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg ); KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } @@ -1995,7 +1995,7 @@ KMCommand::Result KMCopyCommand::execute() // corrupt IMAP cache, see FolderStorage::getMsg() if ( msg == 0 ) { KMessageBox::error( parentWidget(), i18n("Corrupt IMAP cache detected in folder %1. " - "Copying of messages aborted.").arg( srcFolder->prettyURL() ) ); + "Copying of messages aborted.").tqarg( srcFolder->prettyURL() ) ); deleteLater(); return Failed; } @@ -2015,7 +2015,7 @@ KMCommand::Result KMCopyCommand::execute() // make sure the attachment state is only calculated when it's complete if (!newMsg->isComplete()) newMsg->setReadyToShow(false); - newMsg->seStatus(msg->status()); + newMsg->setqStatus(msg->status()); if (srcFolder && !newMsg->isComplete()) { @@ -2461,7 +2461,7 @@ KMCommand::Result KMUrlClickedCommand::execute() mime->name() == "application/x-shellscript" ) { if (KMessageBox::warningYesNo( 0, i18n( "<qt>Do you really want to execute <b>%1</b>?</qt>" ) - .arg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes) + .tqarg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes) return Canceled; } KRun * runner = new KRun( mUrl ); @@ -2605,7 +2605,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() ++unnamedAtmCount; s = i18n("filename for the %1-th unnamed attachment", "attachment.%1") - .arg( unnamedAtmCount ); + .tqarg( unnamedAtmCount ); } curUrl.setFileName( s ); } else { @@ -2644,7 +2644,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) { if ( KMessageBox::warningContinueCancel( parentWidget(), i18n( "A file named %1 already exists. Do you want to overwrite it?" ) - .arg( curUrl.fileName() ), + .tqarg( curUrl.fileName() ), i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) { continue; } @@ -2752,8 +2752,8 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, KMessageBox::error( parentWidget(), i18n( "%2 is detailed error description", "Could not write the file %1:\n%2" ) - .arg( file.name() ) - .arg( TQString::fromLocal8Bit( strerror( errno ) ) ), + .tqarg( file.name() ) + .tqarg( TQString::fromLocal8Bit( strerror( errno ) ) ), i18n( "KMail Error" ) ); return Failed; } @@ -2777,7 +2777,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, { KMessageBox::error( parentWidget(), i18n( "Could not write the file %1." ) - .arg( url.path() ), + .tqarg( url.path() ), i18n( "KMail Error" ) ); return Failed; } @@ -3011,8 +3011,8 @@ KMCommand::Result KMIMChatCommand::execute() { nameList.append( (*it).realName() ); } - TQString names = nameList.join( TQString::fromLatin1( ",\n" ) ); - apology = apology.arg( names ); + TQString names = nameList.join( TQString::tqfromLatin1( ",\n" ) ); + apology = apology.tqarg( names ); } KMessageBox::sorry( parentWidget(), apology ); @@ -3216,7 +3216,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() return; // FIXME: better detection of mimetype?? - if ( !mAtmName.endsWith( ".xia", false ) ) + if ( !mAtmName.tqendsWith( ".xia", false ) ) return; const Kleo::CryptoBackend::Protocol * chiasmus = @@ -3297,7 +3297,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() } static const TQString chomp( const TQString & base, const TQString & suffix, bool cs ) { - return base.endsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ; + return base.tqendsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ; } void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::Error & err, const TQVariant & result ) @@ -3452,7 +3452,7 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify() KMMessage *newMsg = new KMMessage(); newMsg->fromDwString( msg->asDwString() ); - newMsg->seStatus( msg->status() ); + newMsg->setqStatus( msg->status() ); storeChangedMessage( newMsg ); return OK; @@ -3543,7 +3543,7 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher) KMMessage *newMsg = new KMMessage(); newMsg->fromDwString( msg->asDwString() ); - newMsg->seStatus( msg->status() ); + newMsg->setqStatus( msg->status() ); storeChangedMessage( newMsg ); } @@ -3563,8 +3563,8 @@ KMCommand::Result CreateTodoCommand::execute() KMail::KorgHelper::ensureRunning(); - TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( msg->from() ) - .arg( msg->to() ).arg( msg->subject() ); + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( msg->from() ) + .tqarg( msg->to() ).tqarg( msg->subject() ); KTempFile tf; tf.setAutoDelete( true ); @@ -3573,7 +3573,7 @@ KMCommand::Result CreateTodoCommand::execute() tf.close(); KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" ); - iface->openTodoEditor( i18n("Mail: %1").arg( msg->subject() ), txt, uri, + iface->openTodoEditor( i18n("Mail: %1").tqarg( msg->subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", true ); delete iface; diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 8f03571ba..b3de87f75 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -11,7 +11,7 @@ #include <tqtimer.h> #include <tqfont.h> #include <kio/job.h> -#include "kmmsgbase.h" // for KMMsgStatus +#include "kmmsgbase.h" // for KMMsgtqStatus #include <mimelib/string.h> #include <tdepimmacros.h> #include <kservice.h> @@ -663,13 +663,13 @@ class KDE_EXPORT KMSeStatusCommand : public KMCommand public: // Serial numbers - KMSeStatusCommand( KMMsgStatus status, const TQValueList<TQ_UINT32> &, + KMSeStatusCommand( KMMsgtqStatus status, const TQValueList<TQ_UINT32> &, bool toggle=false ); private: virtual Result execute(); - KMMsgStatus mStatus; + KMMsgtqStatus mtqStatus; TQValueList<TQ_UINT32> mSerNums; TQValueList<int> mIds; bool mToggle; diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index d239f7e60..a161070df 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -121,7 +121,7 @@ using KRecentAddress::RecentAddresses; #include <tqregexp.h> #include <tqbuffer.h> #include <tqtooltip.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqheader.h> #include <tqwhatsthis.h> #include <tqfontdatabase.h> @@ -199,7 +199,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); mHeadersToEditorSplitter->setChildrenCollapsible( false ); mHeadersArea = new TQWidget( mHeadersToEditorSplitter ); - mHeadersArea->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum ); + mHeadersArea->tqsetSizePolicy( mHeadersToEditorSplitter->tqsizePolicy().horData(), TQSizePolicy::Maximum ); TQVBoxLayout *v = new TQVBoxLayout( mMainWidget ); v->addWidget( mHeadersToEditorSplitter ); mIdentity = new KPIM::IdentityCombo(kmkernel->identityManager(), mHeadersArea); @@ -341,7 +341,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) TQHBoxLayout *hbox = new TQHBoxLayout( vbox ); { mSignatureStateIndicator = new TQLabel( editorAndCryptoStateIndicators ); - mSignatureStateIndicator->setAlignment( TQt::AlignHCenter ); + mSignatureStateIndicator->tqsetAlignment( TQt::AlignHCenter ); hbox->addWidget( mSignatureStateIndicator ); KConfigGroup reader( KMKernel::config(), "Reader" ); @@ -353,7 +353,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mSignatureStateIndicator->setPalette( p ); mEncryptionStateIndicator = new TQLabel( editorAndCryptoStateIndicators ); - mEncryptionStateIndicator->setAlignment( TQt::AlignHCenter ); + mEncryptionStateIndicator->tqsetAlignment( TQt::AlignHCenter ); hbox->addWidget( mEncryptionStateIndicator ); p.setColor( TQColorGroup::Background, reader.readColorEntry( "PGPMessageEncr" , &defaultEncryptedColor ) ); mEncryptionStateIndicator->setPalette( p ); @@ -648,8 +648,8 @@ bool KMComposeWin::event(TQEvent *e) void KMComposeWin::readColorConfig(void) { if ( GlobalSettings::self()->useDefaultColors() ) { - mForeColor = TQColor(kapp->palette().active().text()); - mBackColor = TQColor(kapp->palette().active().base()); + mForeColor = TQColor(kapp->tqpalette().active().text()); + mBackColor = TQColor(kapp->tqpalette().active().base()); } else { mForeColor = GlobalSettings::self()->foregroundColor(); mBackColor = GlobalSettings::self()->backgroundColor(); @@ -868,7 +868,7 @@ void KMComposeWin::slotContinueAutoSave() i18n("Autosaving the message as %1 " "failed.\n" "Reason: %2" ) - .arg( filename, strerror( status ) ), + .tqarg( filename, strerror( status ) ), i18n("Autosaving Failed") ); mLastAutoSaveErrno = status; } @@ -965,7 +965,7 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width) w->setBuddy( mEditor ); // set dummy so we don't calculate width of '&' for this label. w->adjustSize(); w->show(); - return TQMAX( width, w->sizeHint().width() ); + return TQMAX( width, w->tqsizeHint().width() ); } void KMComposeWin::rethinkFields(bool fromSlot) @@ -1109,9 +1109,9 @@ void KMComposeWin::rethinkFields(bool fromSlot) else mAtmListView->hide(); resize(this->size()); - repaint(); + tqrepaint(); - mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() ); + mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() ); mGrid->activate(); mHeadersArea->show(); @@ -1182,7 +1182,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow, if (aValue & aMask) { aLbl->adjustSize(); - aLbl->resize((int)aLbl->sizeHint().width(),aLbl->sizeHint().height() + 6); + aLbl->resize((int)aLbl->tqsizeHint().width(),aLbl->tqsizeHint().height() + 6); aLbl->setMinimumSize(aLbl->size()); aLbl->show(); aLbl->setBuddy(aCbx); @@ -1193,7 +1193,7 @@ void KMComposeWin::rethinkHeaderLine(int aValue, int aMask, int& aRow, mGrid->addWidget(aCbx, aRow, 1); if ( aChk ) { mGrid->addWidget(aChk, aRow, 2); - aChk->setFixedSize(aChk->sizeHint().width(), aLbl->height()); + aChk->setFixedSize(aChk->tqsizeHint().width(), aLbl->height()); aChk->show(); } aRow++; @@ -1625,9 +1625,9 @@ void KMComposeWin::setupStatusBar(void) statusBar()->insertItem("", 0, 1); statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter); - statusBar()->insertItem(i18n( " Spellcheck: %1 ").arg( " " ), 3, 0, true ); - statusBar()->insertItem(i18n( " Column: %1 ").arg(" "), 2, 0, true); - statusBar()->insertItem(i18n( " Line: %1 ").arg(" "), 1, 0, true); + statusBar()->insertItem(i18n( " Spellcheck: %1 ").tqarg( " " ), 3, 0, true ); + statusBar()->insertItem(i18n( " Column: %1 ").tqarg(" "), 2, 0, true); + statusBar()->insertItem(i18n( " Line: %1 ").tqarg(" "), 1, 0, true); } @@ -1638,9 +1638,9 @@ void KMComposeWin::updateCursorPosition() TQString temp; line = mEditor->currentLine(); col = mEditor->currentColumn(); - temp = i18n(" Line: %1 ").arg(line+1); + temp = i18n(" Line: %1 ").tqarg(line+1); statusBar()->changeItem(temp,1); - temp = i18n(" Column: %1 ").arg(col+1); + temp = i18n(" Column: %1 ").tqarg(col+1); statusBar()->changeItem(temp,2); } @@ -2277,17 +2277,17 @@ bool KMComposeWin::userForgotAttachment() if ( attachWordsList.isEmpty() ) { // default value (FIXME: this is duplicated in configuredialog.cpp) - attachWordsList << TQString::fromLatin1("attachment") - << TQString::fromLatin1("attached"); - if ( TQString::fromLatin1("attachment") != i18n("attachment") ) + attachWordsList << TQString::tqfromLatin1("attachment") + << TQString::tqfromLatin1("attached"); + if ( TQString::tqfromLatin1("attachment") != i18n("attachment") ) attachWordsList << i18n("attachment"); - if ( TQString::fromLatin1("attached") != i18n("attached") ) + if ( TQString::tqfromLatin1("attached") != i18n("attached") ) attachWordsList << i18n("attached"); } - TQRegExp rx ( TQString::fromLatin1("\\b") + + TQRegExp rx ( TQString::tqfromLatin1("\\b") + attachWordsList.join("\\b|\\b") + - TQString::fromLatin1("\\b") ); + TQString::tqfromLatin1("\\b") ); rx.setCaseSensitive( false ); bool gotMatch = false; @@ -2399,14 +2399,14 @@ bool KMComposeWin::addAttach(const KURL aUrl) if ( !aUrl.isValid() ) { KMessageBox::sorry( this, i18n( "<qt><p>KMail could not recognize the location of the attachment (%1);</p>" "<p>you have to specify the full path if you wish to attach a file.</p></qt>" ) - .arg( aUrl.prettyURL() ) ); + .tqarg( aUrl.prettyURL() ) ); return false; } const int maxAttachmentSize = GlobalSettings::maximumAttachmentSize(); const uint maximumAttachmentSizeInByte = maxAttachmentSize*1024*1024; if ( aUrl.isLocalFile() && TQFileInfo( aUrl.pathOrURL() ).size() > maximumAttachmentSizeInByte ) { - KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).arg( maxAttachmentSize ) ); + KMessageBox::sorry( this, i18n( "<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</p>" ).tqarg( maxAttachmentSize ) ); return false; } @@ -3114,7 +3114,7 @@ static void showExportError( TQWidget * w, const GpgME::Error & err ) { const TQString msg = i18n("<qt><p>An error occurred while trying to export " "the key from the backend:</p>" "<p><b>%1</b></p></qt>") - .arg( TQString::fromLocal8Bit( err.asString() ) ); + .tqarg( TQString::fromLocal8Bit( err.asString() ) ); KMessageBox::error( w, msg, i18n("Key Export Failed") ); } @@ -3153,7 +3153,7 @@ void KMComposeWin::slotPublicKeyExportResult( const GpgME::Error & err, const TQ // create message part KMMessagePart * msgPart = new KMMessagePart(); - msgPart->setName( i18n("OpenPGP key 0x%1").arg( mFingerprint ) ); + msgPart->setName( i18n("OpenPGP key 0x%1").tqarg( mFingerprint ) ); msgPart->setTypeStr("application"); msgPart->setSubtypeStr("pgp-keys"); TQValueList<int> dummy; @@ -3665,7 +3665,7 @@ void KMComposeWin::slotPasteClipboardAsQuotation() { if( mEditor->hasFocus() && msg() ) { - TQString s = TQApplication::clipboard()->text(); + TQString s = TQApplication::tqclipboard()->text(); if (!s.isEmpty()) mEditor->insert(addQuotesToText(s)); } @@ -3673,15 +3673,15 @@ void KMComposeWin::slotPasteClipboardAsQuotation() void KMComposeWin::slotPasteClipboardAsAttachment() { - KURL url( TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); + KURL url( TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); if ( url.isValid() ) { - addAttach(TQApplication::clipboard()->text( TQClipboard::Clipboard ) ); + addAttach(TQApplication::tqclipboard()->text( TQClipboard::Clipboard ) ); return; } - TQMimeSource *mimeSource = TQApplication::clipboard()->data(); + TQMimeSource *mimeSource = TQApplication::tqclipboard()->data(); if ( TQImageDrag::canDecode(mimeSource) ) { - slotAttachPNGImageData(mimeSource->encodedData("image/png")); + slotAttachPNGImageData(mimeSource->tqencodedData("image/png")); } else { bool ok; @@ -3691,7 +3691,7 @@ void KMComposeWin::slotPasteClipboardAsAttachment() KMMessagePart *msgPart = new KMMessagePart; msgPart->setName(attName); TQValueList<int> dummy; - msgPart->setBodyAndGuessCte(TQCString(TQApplication::clipboard()->text().latin1()), dummy, + msgPart->setBodyAndGuessCte(TQCString(TQApplication::tqclipboard()->text().latin1()), dummy, kmkernel->msgSender()->sendQuotedPrintable()); addAttach(msgPart); } @@ -3773,7 +3773,7 @@ void KMComposeWin::slotRemoveQuotes() //----------------------------------------------------------------------------- void KMComposeWin::slotUndo() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; if ( ::tqqt_cast<KEdit*>(fw) ) @@ -3784,7 +3784,7 @@ void KMComposeWin::slotUndo() void KMComposeWin::slotRedo() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; if (::tqqt_cast<KEdit*>(fw)) @@ -3796,7 +3796,7 @@ void KMComposeWin::slotRedo() //----------------------------------------------------------------------------- void KMComposeWin::slotCut() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; if (::tqqt_cast<KEdit*>(fw)) @@ -3809,7 +3809,7 @@ void KMComposeWin::slotCut() //----------------------------------------------------------------------------- void KMComposeWin::slotCopy() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; #ifdef KeyPress @@ -3829,12 +3829,12 @@ void KMComposeWin::slotPasteClipboard() void KMComposeWin::paste( TQClipboard::Mode mode ) { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; - TQMimeSource *mimeSource = TQApplication::clipboard()->data( mode ); + TQMimeSource *mimeSource = TQApplication::tqclipboard()->data( mode ); if ( mimeSource->provides("image/png") ) { - slotAttachPNGImageData(mimeSource->encodedData("image/png")); + slotAttachPNGImageData(mimeSource->tqencodedData("image/png")); } else if ( KURLDrag::canDecode( mimeSource ) ) { KURL::List urlList; if( KURLDrag::decode( mimeSource, urlList ) ) { @@ -3872,7 +3872,7 @@ void KMComposeWin::paste( TQClipboard::Mode mode ) //----------------------------------------------------------------------------- void KMComposeWin::slotMarkAll() { - TQWidget* fw = focusWidget(); + TQWidget* fw = tqfocusWidget(); if (!fw) return; if (::tqqt_cast<TQLineEdit*>(fw)) @@ -4279,7 +4279,7 @@ bool KMComposeWin::saveDraftOrTemplate( const TQString &folderName, "identify \"%1\" does not exist (anymore); " "therefore, the default drafts or templates " "folder will be used.") - .arg( id.identityName() ) ); + .tqarg( id.identityName() ) ); } } if ( imapTheFolder && imapTheFolder->noContent() ) @@ -4463,7 +4463,7 @@ bool KMComposeWin::checkRecipientNumber() const GlobalSettings::self()->tooManyRecipients() && mRecipientsEditor->recipients().count() > thresHold ) { if ( KMessageBox::questionYesNo( mMainWidget, - i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").arg(thresHold), + i18n("You are trying to send the mail to more than %1 recipients. Send message anyway?").tqarg(thresHold), i18n("Too many receipients"), i18n("&Send as Is"), i18n("&Edit Recipients")) == KMessageBox::No ) { @@ -4780,10 +4780,10 @@ void KMComposeWin::slotSpellcheckDone(int result) statusBar()->changeItem(i18n(" Spell check complete."),0); break; } - TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) ); + TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneCleartqStatus()) ); } -void KMComposeWin::slotSpellcheckDoneClearStatus() +void KMComposeWin::slotSpellcheckDoneCleartqStatus() { statusBar()->changeItem("", 0); } @@ -4829,7 +4829,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid ) // of the identity, we assume that since the user typed it // they want to keep it if ( mEdtBcc->text() != ident.bcc() && !mEdtBcc->text().isEmpty() ) { - TQString temp_string( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() ); + TQString temp_string( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() ); mEdtBcc->setText( temp_string ); } else { // if the user typed the same address as the preset BCC @@ -4843,7 +4843,7 @@ void KMComposeWin::slotIdentityChanged( uint uoid ) // allowing the user to keep all addresses if( mEdtBcc && mEdtBcc->edited() && !ident.bcc().isEmpty() ) { if( !mEdtBcc->text().isEmpty() ) { - TQString temp_string ( mEdtBcc->text() + TQString::fromLatin1(",") + ident.bcc() ); + TQString temp_string ( mEdtBcc->text() + TQString::tqfromLatin1(",") + ident.bcc() ); mEdtBcc->setText( temp_string ); } else { mEdtBcc->setText( ident.bcc() ); @@ -4982,7 +4982,7 @@ void KMComposeWin::slotSpellcheckConfig() KWin twin; TQTabDialog qtd (this, "tabdialog", true); KSpellConfig mKSpellConfig (&qtd); - mKSpellConfig.layout()->setMargin( KDialog::marginHint() ); + mKSpellConfig.tqlayout()->setMargin( KDialog::marginHint() ); qtd.addTab (&mKSpellConfig, i18n("Spellchecker")); qtd.setCancelButton (); @@ -5177,19 +5177,19 @@ void KMComposeWin::slotSizeAction( int size ) void KMComposeWin::slotAlignLeft() { toggleMarkup(true); - mEditor->TQTextEdit::setAlignment( AlignLeft ); + mEditor->TQTextEdit::tqsetAlignment( AlignLeft ); } void KMComposeWin::slotAlignCenter() { toggleMarkup(true); - mEditor->TQTextEdit::setAlignment( AlignHCenter ); + mEditor->TQTextEdit::tqsetAlignment( AlignHCenter ); } void KMComposeWin::slotAlignRight() { toggleMarkup(true); - mEditor->TQTextEdit::setAlignment( AlignRight ); + mEditor->TQTextEdit::tqsetAlignment( AlignRight ); } void KMComposeWin::slotTextBold() @@ -5404,6 +5404,6 @@ void KMComposeWin::recipientEditorSizeHintChanged() void KMComposeWin::setMaximumHeaderSize() { - mHeadersArea->setMaximumHeight( mHeadersArea->sizeHint().height() ); + mHeadersArea->setMaximumHeight( mHeadersArea->tqsizeHint().height() ); } diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 51b4b1dc1..6193e8cb7 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -21,8 +21,8 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <clipboard.h> -#include <palette.h> +#include <tqclipboard.h> +#include <tqpalette.h> #include <tqfont.h> #include <tqptrlist.h> #include <tqvaluevector.h> @@ -470,7 +470,7 @@ private slots: // void slotSpellConfigure(); void slotSpellcheckDone(int result); - void slotSpellcheckDoneClearStatus(); + void slotSpellcheckDoneCleartqStatus(); public slots: // kmkernel void autoSaveMessage(); diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 99382915d..df9582436 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -169,7 +169,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e) command->start(); } else if( e->provides("image/png") ) { - emit attachPNGImageData(e->encodedData("image/png")); + emit attachPNGImageData(e->tqencodedData("image/png")); } else if( KURLDrag::canDecode( e ) ) { KURL::List urlList; @@ -251,7 +251,7 @@ void KMEdit::initializeAutoSpellChecking() TQColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp TQColor defaultColor2( 0x00, 0x70, 0x00 ); TQColor defaultColor3( 0x00, 0x60, 0x00 ); - TQColor defaultForeground( kapp->palette().active().text() ); + TQColor defaultForeground( kapp->tqpalette().active().text() ); TQColor c = TQt::red; KConfigGroup readerConfig( KMKernel::config(), "Reader" ); @@ -281,7 +281,7 @@ TQPopupMenu *KMEdit::createPopupMenu( const TQPoint& pos ) enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelectAll }; TQPopupMenu *menu = KEdit::createPopupMenu( pos ); - if ( !TQApplication::clipboard()->image().isNull() ) { + if ( !TQApplication::tqclipboard()->image().isNull() ) { int id = menu->idAt(0); menu->setItemEnabled( id - IdPaste, true); } @@ -454,7 +454,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) TQT_SLOT(slotExternalEditorDone(KProcess*))); if (!mExtEditorProcess->start()) { - KMessageBox::error( topLevelWidget(), + KMessageBox::error( tqtopLevelWidget(), i18n("Unable to start external editor.") ); killExternalEditor(); } else { @@ -607,7 +607,7 @@ void KMEdit::slotExternalEditorTempFileChanged( const TQString & fileName ) { insertLine(TQString::fromLocal8Bit(KPIM::kFileToString( fileName, true, false )), -1); setAutoUpdate(true); - repaint(); + tqrepaint(); } void KMEdit::slotExternalEditorDone( KProcess * proc ) { @@ -627,7 +627,7 @@ void KMEdit::killExternalEditor() { bool KMEdit::checkExternalEditorFinished() { if ( !mExtEditorProcess ) return true; - switch ( KMessageBox::warningYesNoCancel( topLevelWidget(), + switch ( KMessageBox::warningYesNoCancel( tqtopLevelWidget(), i18n("The external editor is still running.\n" "Abort the external editor or leave it open?"), i18n("External Editor"), @@ -880,7 +880,7 @@ void KMEdit::slotSpellDone() mComposer->sujectLineWidget()->deselect(); if (status == KSpell::Error) { - KMessageBox::sorry( topLevelWidget(), + KMessageBox::sorry( tqtopLevelWidget(), i18n("ISpell/Aspell could not be started. Please " "make sure you have ISpell or Aspell properly " "configured and in your PATH.") ); @@ -889,7 +889,7 @@ void KMEdit::slotSpellDone() else if (status == KSpell::Crashed) { spellcheck_stop(); - KMessageBox::sorry( topLevelWidget(), + KMessageBox::sorry( tqtopLevelWidget(), i18n("ISpell/Aspell seems to have crashed.") ); emit spellcheck_done( KS_CANCEL ); } @@ -898,7 +898,7 @@ void KMEdit::slotSpellDone() if( mSpellLineEdit ) spellcheck(); else if( !mComposer->subjectTextWasSpellChecked() && status == KSpell::FinishedNoMisspellingsEncountered ) - KMessageBox::information( topLevelWidget(), + KMessageBox::information( tqtopLevelWidget(), i18n("No misspellings encountered.") ); } } diff --git a/kmail/kmedit.h b/kmail/kmedit.h index d77e801b7..4d2535e4d 100644 --- a/kmail/kmedit.h +++ b/kmail/kmedit.h @@ -11,7 +11,7 @@ #include <ksyntaxhighlighter.h> #include <tqmap.h> #include <tqstringlist.h> -#include <clipboard.h> +#include <tqclipboard.h> class KMComposeWin; class KSpellConfig; diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index 49ff2930f..a4efae487 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -16,7 +16,7 @@ #include <kfiledialog.h> #include <kstandarddirs.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> //============================================================================= @@ -35,7 +35,7 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare hbl->addWidget( mLineEdit, 1 /*stretch*/ ); mBtn = new TQPushButton( TQString() ,this ); mBtn->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) ); - mBtn->setFixedHeight( mLineEdit->sizeHint().height() ); + mBtn->setFixedHeight( mLineEdit->tqsizeHint().height() ); TQToolTip::add( mBtn, i18n( "Open Address Book" ) ); hbl->addWidget( mBtn ); @@ -136,7 +136,7 @@ void KMSoundTestWidget::playSound() if ( parameter.isEmpty() ) return ; TQString play = parameter; - TQString file = TQString::fromLatin1("file:"); + TQString file = TQString::tqfromLatin1("file:"); if (parameter.startsWith(file)) play = parameter.mid(file.length()); KAudioPlayer::play(TQFile::encodeName(play)); diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp index 28a64633d..4441b8611 100644 --- a/kmail/kmfilter.cpp +++ b/kmail/kmfilter.cpp @@ -113,7 +113,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const if ( FilterLog::instance()->isLogging() ) { TQString logText( i18n( "<b>Applying filter action:</b> %1" ) - .arg( (*it)->displayString() ) ); + .tqarg( (*it)->displayString() ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } @@ -123,7 +123,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const case KMFilterAction::CriticalError: if ( FilterLog::instance()->isLogging() ) { TQString logText = TQString( "<font color=#FF0000>%1</font>" ) - .arg( i18n( "A critical error occurred. Processing stops here." ) ); + .tqarg( i18n( "A critical error occurred. Processing stops here." ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } // in case it's a critical error: return immediately! @@ -131,7 +131,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const case KMFilterAction::ErrorButGoOn: if ( FilterLog::instance()->isLogging() ) { TQString logText = TQString( "<font color=#FF0000>%1</font>" ) - .arg( i18n( "A problem was found while applying this action." ) ); + .tqarg( i18n( "A problem was found while applying this action." ) ); FilterLog::instance()->add( logText, FilterLog::appliedAction ); } default: @@ -262,7 +262,7 @@ void KMFilter::readConfig(KConfig* config) numActions = config->readNumEntry("actions",0); if (numActions > FILTER_MAX_ACTIONS) { numActions = FILTER_MAX_ACTIONS ; - KMessageBox::information( 0, i18n("<qt>Too many filter actions in filter rule <b>%1</b>.</qt>").arg( mPattern.name() ) ); + KMessageBox::information( 0, i18n("<qt>Too many filter actions in filter rule <b>%1</b>.</qt>").tqarg( mPattern.name() ) ); } for ( i=0 ; i < numActions ; i++ ) { @@ -287,7 +287,7 @@ void KMFilter::readConfig(KConfig* config) } else KMessageBox::information( 0 /* app-global modal dialog box */, i18n("<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring it.</qt>") - .arg( config->readEntry( actName ) ).arg( mPattern.name() ) ); + .tqarg( config->readEntry( actName ) ).tqarg( mPattern.name() ) ); } mAccounts = config->readIntListEntry( "accounts-set" ); diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index d31eaf7a8..6a5e12324 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -44,11 +44,11 @@ using KMail::RegExpLineEdit; #include <kurlrequester.h> #include <tqlabel.h> -#include <layout.h> -#include <textcodec.h> +#include <tqlayout.h> +#include <tqtextcodec.h> #include <tqtimer.h> #include <tqobject.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <assert.h> @@ -185,7 +185,7 @@ const TQString KMFilterActionWithUOID::argsAsString() const const TQString KMFilterActionWithUOID::displayString() const { // FIXME after string freeze: - // return i18n("").arg( ); + // return i18n("").tqarg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -236,7 +236,7 @@ const TQString KMFilterActionWithString::argsAsString() const const TQString KMFilterActionWithString::displayString() const { // FIXME after string freeze: - // return i18n("").arg( ); + // return i18n("").tqarg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -483,11 +483,11 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs } tf->close(); } - // TQString( "%0 and %1 and %1" ).arg( 0 ).arg( 1 ) + // TQString( "%0 and %1 and %1" ).tqarg( 0 ).tqarg( 1 ) // returns "0 and 1 and %1", so we must call .arg as // many times as there are %n's, regardless of their multiplicity. if ((*it) == -1) result.replace( "%-1", tempFileName ); - else result = result.arg( tempFileName ); + else result = result.tqarg( tempFileName ); } // And finally, replace the %{foo} with the content of the foo @@ -742,13 +742,13 @@ void KMFilterActionIdentity::setParamWidgetValue( TQWidget * paramWidget ) const } //============================================================================= -// KMFilterActionSeStatus - set status to +// KMFilterActionSetqStatus - set status to // Set the status of messages //============================================================================= -class KMFilterActionSeStatus: public KMFilterActionWithStringList +class KMFilterActionSetqStatus: public KMFilterActionWithStringList { public: - KMFilterActionSeStatus(); + KMFilterActionSetqStatus(); virtual ReturnCode process(KMMessage* msg) const; virtual bool requiresBody(KMMsgBase*) const; @@ -762,7 +762,7 @@ public: }; -static const KMMsgStatus stati[] = +static const KMMsgtqStatus stati[] = { KMMsgStatusFlag, KMMsgStatusRead, @@ -776,18 +776,18 @@ static const KMMsgStatus stati[] = KMMsgStatusSpam, KMMsgStatusHam }; -static const int StatiCount = sizeof( stati ) / sizeof( KMMsgStatus ); +static const int StatiCount = sizeof( stati ) / sizeof( KMMsgtqStatus ); -KMFilterAction* KMFilterActionSeStatus::newAction() +KMFilterAction* KMFilterActionSetqStatus::newAction() { - return (new KMFilterActionSeStatus); + return (new KMFilterActionSetqStatus); } -KMFilterActionSeStatus::KMFilterActionSeStatus() +KMFilterActionSetqStatus::KMFilterActionSetqStatus() : KMFilterActionWithStringList( "set status", i18n("Mark As") ) { // if you change this list, also update - // KMFilterActionSeStatus::stati above + // KMFilterActionSetqStatus::stati above mParameterList.append( "" ); mParameterList.append( i18n("msg status","Important") ); mParameterList.append( i18n("msg status","Read") ); @@ -804,22 +804,22 @@ KMFilterActionSeStatus::KMFilterActionSeStatus() mParameter = *mParameterList.at(0); } -KMFilterAction::ReturnCode KMFilterActionSeStatus::process(KMMessage* msg) const +KMFilterAction::ReturnCode KMFilterActionSetqStatus::process(KMMessage* msg) const { int idx = mParameterList.findIndex( mParameter ); if ( idx < 1 ) return ErrorButGoOn; - KMMsgStatus status = stati[idx-1] ; - msg->seStatus( status ); + KMMsgtqStatus status = stati[idx-1] ; + msg->setqStatus( status ); return GoOn; } -bool KMFilterActionSeStatus::requiresBody(KMMsgBase*) const +bool KMFilterActionSetqStatus::requiresBody(KMMsgBase*) const { return false; } -void KMFilterActionSeStatus::argsFromString( const TQString argsStr ) +void KMFilterActionSetqStatus::argsFromString( const TQString argsStr ) { if ( argsStr.length() == 1 ) { for ( int i = 0 ; i < StatiCount ; i++ ) @@ -831,19 +831,19 @@ void KMFilterActionSeStatus::argsFromString( const TQString argsStr ) mParameter = *mParameterList.at(0); } -const TQString KMFilterActionSeStatus::argsAsString() const +const TQString KMFilterActionSetqStatus::argsAsString() const { int idx = mParameterList.findIndex( mParameter ); if ( idx < 1 ) return TQString(); - KMMsgStatus status = stati[idx-1]; + KMMsgtqStatus status = stati[idx-1]; return KMMsgBase::statusToStr(status); } -const TQString KMFilterActionSeStatus::displayString() const +const TQString KMFilterActionSetqStatus::displayString() const { // FIXME after string freeze: - // return i18n("").arg( ); + // return i18n("").tqarg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -938,7 +938,7 @@ const TQString KMFilterActionFakeDisposition::argsAsString() const const TQString KMFilterActionFakeDisposition::displayString() const { // FIXME after string freeze: - // return i18n("").arg( ); + // return i18n("").tqarg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -1064,7 +1064,7 @@ TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* parent ) const cb->setInsertionPolicy( TQComboBox::AtBottom ); hbl->addWidget( cb, 0 /* stretch */ ); TQLabel *l = new TQLabel( i18n("With value:"), w ); - l->setFixedWidth( l->sizeHint().width() ); + l->setFixedWidth( l->tqsizeHint().width() ); hbl->addWidget( l, 0 ); TQLineEdit *le = new KLineEdit( w, "ledit" ); hbl->addWidget( le, 1 ); @@ -1123,7 +1123,7 @@ const TQString KMFilterActionAddHeader::argsAsString() const const TQString KMFilterActionAddHeader::displayString() const { // FIXME after string freeze: - // return i18n("").arg( ); + // return i18n("").tqarg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -1214,14 +1214,14 @@ TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* parent ) con hbl->addWidget( cb, 0 /* stretch */ ); TQLabel *l = new TQLabel( i18n("Replace:"), w ); - l->setFixedWidth( l->sizeHint().width() ); + l->setFixedWidth( l->tqsizeHint().width() ); hbl->addWidget( l, 0 ); RegExpLineEdit *rele = new RegExpLineEdit( w, "search" ); hbl->addWidget( rele, 1 ); l = new TQLabel( i18n("With:"), w ); - l->setFixedWidth( l->sizeHint().width() ); + l->setFixedWidth( l->tqsizeHint().width() ); hbl->addWidget( l, 0 ); TQLineEdit *le = new KLineEdit( w, "replace" ); @@ -1299,7 +1299,7 @@ const TQString KMFilterActionRewriteHeader::argsAsString() const const TQString KMFilterActionRewriteHeader::displayString() const { // FIXME after string freeze: - // return i18n("").arg( ); + // return i18n("").tqarg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -1617,9 +1617,9 @@ const TQString KMFilterActionForward::argsAsString() const const TQString KMFilterActionForward::displayString() const { if ( mTemplate.isEmpty() ) - return i18n( "Forward to %1 with default template " ).arg( mParameter ); + return i18n( "Forward to %1 with default template " ).tqarg( mParameter ); else - return i18n( "Forward to %1 with template %2" ).arg( mParameter, mTemplate ); + return i18n( "Forward to %1 with template %2" ).tqarg( mParameter, mTemplate ); } //============================================================================= @@ -1744,10 +1744,10 @@ class PipeJob : public KPIM::ThreadWeaver::Job if ( !origSerNum.isEmpty() ) mMsg->setHeaderField( "X-KMail-Filtered", origSerNum ); if ( filterFolder && handler ) { - bool oldStatus = handler->ignoreChanges( true ); + bool oldtqStatus = handler->ignoreChanges( true ); filterFolder->take( filterFolder->find( mMsg ) ); filterFolder->addMsg( mMsg ); - handler->ignoreChanges( oldStatus ); + handler->ignoreChanges( oldtqStatus ); } else { kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl; } @@ -1878,7 +1878,7 @@ const TQString KMFilterActionWithTest::argsAsString() const const TQString KMFilterActionWithTest::displayString() const { // FIXME after string freeze: - // return i18n("").arg( ); + // return i18n("").tqarg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -1898,7 +1898,7 @@ KMFilterAction::ReturnCode KMFilterActionExecSound::process(KMMessage*) const if ( mParameter.isEmpty() ) return ErrorButGoOn; TQString play = mParameter; - TQString file = TQString::fromLatin1("file:"); + TQString file = TQString::tqfromLatin1("file:"); if (mParameter.startsWith(file)) play = mParameter.mid(file.length()); KAudioPlayer::play(TQFile::encodeName(play)); @@ -1955,7 +1955,7 @@ const TQString KMFilterActionWithUrl::argsAsString() const const TQString KMFilterActionWithUrl::displayString() const { // FIXME after string freeze: - // return i18n("").arg( ); + // return i18n("").tqarg( ); return label() + " \"" + TQStyleSheet::escape( argsAsString() ) + "\""; } @@ -1970,7 +1970,7 @@ void KMFilterActionDict::init(void) insert( KMFilterActionMove::newAction ); insert( KMFilterActionCopy::newAction ); insert( KMFilterActionIdentity::newAction ); - insert( KMFilterActionSeStatus::newAction ); + insert( KMFilterActionSetqStatus::newAction ); insert( KMFilterActionFakeDisposition::newAction ); insert( KMFilterActionTransport::newAction ); insert( KMFilterActionReplyTo::newAction ); diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index 76c760ad2..b9d0e5060 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -33,7 +33,7 @@ using KMail::FilterImporterExporter; #include <kpushbutton.h> // other TQt headers: -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqwidgetstack.h> @@ -234,7 +234,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo mConfigureShortcut = new TQCheckBox( i18n("Add this filter to the Apply Filter menu"), adv_w ); gl->addMultiCellWidget( mConfigureShortcut, 7, 7, 0, 1 ); TQLabel *keyButtonLabel = new TQLabel( i18n( "Shortcut:" ), adv_w ); - keyButtonLabel->setAlignment( AlignVCenter | AlignRight ); + keyButtonLabel->tqsetAlignment( AlignVCenter | AlignRight ); gl->addMultiCellWidget( keyButtonLabel, 7, 7, 2, 2 ); mKeyButton = new KKeyButton( adv_w, "FilterShortcutSelector" ); gl->addMultiCellWidget( mKeyButton, 7, 7, 3, 3 ); @@ -339,11 +339,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFinished()) ); - KConfigGroup geometry( KMKernel::config(), "Geometry"); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry"); const char * configKey = bPopFilter ? "popFilterDialogSize" : "filterDialogSize"; - if ( geometry.hasKey( configKey ) ) - resize( geometry.readSizeEntry( configKey ) ); + if ( tqgeometry.hasKey( configKey ) ) + resize( tqgeometry.readSizeEntry( configKey ) ); else adjustSize(); @@ -356,8 +356,8 @@ void KMFilterDlg::slotFinished() { } void KMFilterDlg::slotSaveSize() { - KConfigGroup geometry( KMKernel::config(), "Geometry" ); - geometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() ); + KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + tqgeometry.writeEntry( bPopFilter ? "popFilterDialogSize" : "filterDialogSize", size() ); } /** Set action of popFilter */ @@ -558,7 +558,7 @@ void KMFilterDlg::slotUpdateAccountList() TQCheckListItem *listItem = new TQCheckListItem( mAccountList, top, a->name(), TQCheckListItem::CheckBox ); listItem->setText( 1, a->type() ); - listItem->setText( 2, TQString( "%1" ).arg( a->id() ) ); + listItem->setText( 2, TQString( "%1" ).tqarg( a->id() ) ); if ( mFilter ) listItem->setOn( mFilter->applyOnAccount( a->id() ) ); top = listItem; @@ -595,19 +595,19 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons mBtnTop = new KPushButton( TQString(), hb ); mBtnTop->setAutoRepeat( true ); mBtnTop->setIconSet( BarIconSet( "top", KIcon::SizeSmall ) ); - mBtnTop->setMinimumSize( mBtnTop->sizeHint() * 1.2 ); + mBtnTop->setMinimumSize( mBtnTop->tqsizeHint() * 1.2 ); mBtnUp = new KPushButton( TQString(), hb ); mBtnUp->setAutoRepeat( true ); mBtnUp->setIconSet( BarIconSet( "up", KIcon::SizeSmall ) ); - mBtnUp->setMinimumSize( mBtnUp->sizeHint() * 1.2 ); + mBtnUp->setMinimumSize( mBtnUp->tqsizeHint() * 1.2 ); mBtnDown = new KPushButton( TQString(), hb ); mBtnDown->setAutoRepeat( true ); mBtnDown->setIconSet( BarIconSet( "down", KIcon::SizeSmall ) ); - mBtnDown->setMinimumSize( mBtnDown->sizeHint() * 1.2 ); + mBtnDown->setMinimumSize( mBtnDown->tqsizeHint() * 1.2 ); mBtnBot = new KPushButton( TQString(), hb ); mBtnBot->setAutoRepeat( true ); mBtnBot->setIconSet( BarIconSet( "bottom", KIcon::SizeSmall ) ); - mBtnBot->setMinimumSize( mBtnBot->sizeHint() * 1.2 ); + mBtnBot->setMinimumSize( mBtnBot->tqsizeHint() * 1.2 ); TQToolTip::add( mBtnTop, i18n("Top") ); TQToolTip::add( mBtnUp, i18n("Up") ); TQToolTip::add( mBtnDown, i18n("Down") ); @@ -622,13 +622,13 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons hb->setSpacing(4); mBtnNew = new TQPushButton( TQString(), hb ); mBtnNew->setPixmap( BarIcon( "filenew", KIcon::SizeSmall ) ); - mBtnNew->setMinimumSize( mBtnNew->sizeHint() * 1.2 ); + mBtnNew->setMinimumSize( mBtnNew->tqsizeHint() * 1.2 ); mBtnCopy = new TQPushButton( TQString(), hb ); mBtnCopy->setIconSet( BarIconSet( "editcopy", KIcon::SizeSmall ) ); - mBtnCopy->setMinimumSize( mBtnCopy->sizeHint() * 1.2 ); + mBtnCopy->setMinimumSize( mBtnCopy->tqsizeHint() * 1.2 ); mBtnDelete = new TQPushButton( TQString(), hb ); mBtnDelete->setIconSet( BarIconSet( "editdelete", KIcon::SizeSmall ) ); - mBtnDelete->setMinimumSize( mBtnDelete->sizeHint() * 1.2 ); + mBtnDelete->setMinimumSize( mBtnDelete->tqsizeHint() * 1.2 ); mBtnRename = new TQPushButton( i18n("Rename..."), hb ); TQToolTip::add( mBtnNew, i18n("New") ); TQToolTip::add( mBtnCopy, i18n("Copy") ); @@ -682,7 +682,7 @@ void KMFilterListBox::createFilter( const TQCString & field, KMFilter *newFilter = new KMFilter(0, bPopFilter); newFilter->pattern()->append( newRule ); - newFilter->pattern()->setName( TQString("<%1>:%2").arg( TQString(field) ).arg( TQString(value) ) ); + newFilter->pattern()->setName( TQString("<%1>:%2").tqarg( TQString(field) ).tqarg( TQString(value) ) ); KMFilterActionDesc *desc = (*kmkernel->filterActionDict())["transfer"]; if ( desc ) @@ -712,7 +712,7 @@ void KMFilterListBox::slotUpdateFilterName() if ( mFilterList.at(mIdxSelItem)->isAutoNaming() ) { // auto-naming of patterns if ( !p->isEmpty() && p->first() && !p->first()->field().stripWhiteSpace().isEmpty() ) - shouldBeName = TQString( "<%1>: %2" ).arg( TQString(p->first()->field()) ).arg( TQString(p->first()->contents()) ); + shouldBeName = TQString( "<%1>: %2" ).tqarg( TQString(p->first()->field()) ).tqarg( TQString(p->first()->contents()) ); else shouldBeName = "<" + i18n("unnamed") + ">"; p->setName( shouldBeName ); @@ -946,9 +946,9 @@ void KMFilterListBox::slotRename() ( i18n("Rename Filter"), i18n("Rename filter \"%1\" to:\n(leave the field empty for automatic naming)") - .arg( filter->pattern()->name() ) /*label*/, + .tqarg( filter->pattern()->name() ) /*label*/, filter->pattern()->name() /* initial value */, - &okPressed, topLevelWidget(), 0, validator + &okPressed, tqtopLevelWidget(), 0, validator ); delete validator; @@ -1140,13 +1140,13 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name ) // don't show scroll bars. mComboBox->setSizeLimit( mComboBox->count() ); - // layout management: - // o the combo box is not to be made larger than it's sizeHint(), + // tqlayout management: + // o the combo box is not to be made larger than it's tqsizeHint(), // the parameter widget should grow instead. // o the whole widget takes all space horizontally, but is fixed vertically. mComboBox->adjustSize(); - mComboBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + mComboBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); updateGeometry(); // redirect focus to the filter action combo box diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index 1f7407780..df8b4daf1 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -80,7 +80,7 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, dirinfo.setFile( mStorage->location() ); if ( !dirinfo.exists() ) { int rc = mStorage->create(); - TQString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>").arg(aFolderName).arg(strerror(rc)); + TQString msg = i18n("<qt>Error while creating file <b>%1</b>:<br>%2</qt>").tqarg(aFolderName).tqarg(strerror(rc)); if ( rc ) { KMessageBox::information(0, msg); } @@ -272,7 +272,7 @@ KMFolderDir* KMFolder::createChildFolder() { if (mkdir(TQFile::encodeName(childDir), S_IRWXU) != 0 && chmod(TQFile::encodeName(childDir), S_IRWXU) != 0) { - TQString wmsg = TQString(" '%1': %2").arg(childDir).arg(strerror(errno)); + TQString wmsg = TQString(" '%1': %2").tqarg(childDir).tqarg(strerror(errno)); KMessageBox::information(0,i18n("Failed to create folder") + wmsg); return 0; } @@ -470,10 +470,10 @@ int KMFolder::countUnreadRecursive() return count; } -void KMFolder::msgStatusChanged( const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, int idx ) +void KMFolder::msgStatusChanged( const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx ) { - mStorage->msgStatusChanged( oldStatus, newStatus, idx ); + mStorage->msgStatusChanged( oldtqStatus, newtqStatus, idx ); } int KMFolder::open(const char *owner) @@ -828,15 +828,15 @@ int KMFolder::writeIndex( bool createEmptyIndex ) return mStorage->writeIndex( createEmptyIndex ); } -void KMFolder::seStatus( int idx, KMMsgStatus status, bool toggle ) +void KMFolder::setqStatus( int idx, KMMsgtqStatus status, bool toggle ) { - mStorage->seStatus( idx, status, toggle ); + mStorage->setqStatus( idx, status, toggle ); } -void KMFolder::seStatus( TQValueList<int>& ids, KMMsgStatus status, +void KMFolder::setqStatus( TQValueList<int>& ids, KMMsgtqStatus status, bool toggle ) { - mStorage->seStatus( ids, status, toggle); + mStorage->setqStatus( ids, status, toggle); } void KMFolder::setIconPaths( const TQString &normalPath, @@ -929,7 +929,7 @@ bool KMFolder::isValidName( const TQString &folderName, TQString &message ) } } if ( !delimiter.isEmpty() && folderName.find( delimiter ) != -1 ) { - message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter ); + message = i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).tqarg( delimiter ); return false; } } diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index 351e55b45..60db26661 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -60,7 +60,7 @@ typedef TQValueList<TQ_UINT32> SerNumList; * * @section Accounts * The accounts (of KMail) that are fed into the folder are - * represented as the children of the folder. They are only stored here + * represented as the tqchildren of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ @@ -169,10 +169,10 @@ public: /** Specify, that the folder can't contain mails. */ void setNoContent(bool aNoContent); - /** Returns, if the folder can't have children */ + /** Returns, if the folder can't have tqchildren */ bool noChildren() const; - /** Specify, that the folder can't have children */ + /** Specify, that the folder can't have tqchildren */ void setNoChildren(bool aNoChildren); /** Read message at given index. Indexing starts at zero */ @@ -273,10 +273,10 @@ public: contained by this folder */ int countUnreadRecursive(); - /** Called by KMMsgBase::seStatus when status of a message has changed + /** Called by KMMsgBase::setqStatus when status of a message has changed required to keep the number unread messages variable current. */ - void msgStatusChanged( const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, + void msgStatusChanged( const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx); /** Open folder for access. @@ -490,10 +490,10 @@ public: int writeIndex( bool createEmptyIndex = false ); /** Set the status of the message at index @p idx to @p status. */ - void seStatus(int idx, KMMsgStatus status, bool toggle=false); + void setqStatus(int idx, KMMsgtqStatus status, bool toggle=false); /** Set the status of the message(s) in the TQValueList @p ids to @p status. */ - void seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle=false); + void setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle=false); /** Icon related methods */ bool useCustomIcons() const { return mUseCustomIcons; } diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index d30316a9c..10dfff5af 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -75,7 +75,7 @@ using KMail::ListJob; #include <tqfile.h> #include <tqhbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqradiobutton.h> #include <tqvaluelist.h> #include "annotationjobs.h" @@ -215,7 +215,7 @@ KMFolderCachedImap::KMFolderCachedImap( KMFolder* folder, const char* aName ) KMessageBox::error( 0, i18n( "The UID cache file for folder %1 could not be read. There " "could be a problem with file system permission, or it is corrupted." - ).arg( folder->prettyURL() ) ); + ).tqarg( folder->prettyURL() ) ); // try to unlink it, in case it was corruped. If it couldn't be read // because of permissions, this will fail, which is fine unlink( TQFile::encodeName( uidCacheLocation() ) ); @@ -486,7 +486,7 @@ int KMFolderCachedImap::writeUidCache() } KMessageBox::error( 0, i18n( "The UID cache file for folder %1 could not be written. There " - "could be a problem with file system permission." ).arg( folder()->prettyURL() ) ); + "could be a problem with file system permission." ).tqarg( folder()->prettyURL() ) ); return -1; } @@ -739,7 +739,7 @@ void KMFolderCachedImap::slotTroubleshoot() TQString str = i18n("Are you sure you want to refresh the IMAP cache of " "the folder %1 and all its subfolders?\nThis will " "remove all changes you have done locally to your " - "folders.").arg( label() ); + "folders.").tqarg( label() ); TQString s1 = i18n("Refresh IMAP Cache"); TQString s2 = i18n("&Refresh"); if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) == @@ -774,7 +774,7 @@ void KMFolderCachedImap::slotTroubleshoot() void KMFolderCachedImap::serverSync( bool recurse, bool quotaOnly ) { if( mSyncState != SYNC_STATE_INITIAL ) { - if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { + if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).tqarg( imapPath() ).tqarg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { mSyncState = SYNC_STATE_INITIAL; } else return; } @@ -899,14 +899,14 @@ void KMFolderCachedImap::serverSyncInternal() // Cancelled by user, or slave can't start // kdDebug(5006) << "makeConnection said Error, aborting." << endl; // We stop here. We're already in SYNC_STATE_INITIAL for the next time. - newState( mProgress, i18n( "Error connecting to server %1" ).arg( mAccount->host() ) ); + newState( mProgress, i18n( "Error connecting to server %1" ).tqarg( mAccount->host() ) ); close("cachedimap"); emit folderComplete(this, false); break; } else if ( cs == ImapAccountBase::Connecting ) { mAccount->setAnnotationCheckPassed( false ); // kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl; - newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) ); + newState( mProgress, i18n("Connecting to %1").tqarg( mAccount->host() ) ); // We'll wait for the connectionResult signal from the account. connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); @@ -1478,7 +1478,7 @@ void KMFolderCachedImap::uploadNewMessages() && !(mUserRights & KMail::ACLJobs::Insert) ) { // write access revoked KMessageBox::information( 0, i18n("<p>Your access rights to folder <b>%1</b> have been restricted, " - "it will no longer be possible to add messages to this folder.</p>").arg( folder()->prettyURL() ), + "it will no longer be possible to add messages to this folder.</p>").tqarg( folder()->prettyURL() ), i18n("Acces rights revoked"), "KMailACLRevocationNotification" ); } } @@ -1531,7 +1531,7 @@ void KMFolderCachedImap::uploadFlags() // Send off a status setting job for each set. for( TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) { TQString imappath = imapPath() + ";UID=" + ( *slit ); - mAccount->setImapStatus(folder(), imappath, flags); + mAccount->setImaptqStatus(folder(), imappath, flags); } } // FIXME END DUPLICATED FROM KMFOLDERIMAP @@ -1575,7 +1575,7 @@ void KMFolderCachedImap::uploadSeenFlags() mStatusFlagsJobs += sets.count(); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - mAccount->setImapSeenStatus( folder(), imappath, true ); + mAccount->setImapSeentqStatus( folder(), imappath, true ); } } if ( !unseenUids.isEmpty() ) { @@ -1583,7 +1583,7 @@ void KMFolderCachedImap::uploadSeenFlags() mStatusFlagsJobs += sets.count(); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - mAccount->setImapSeenStatus( folder(), imappath, false ); + mAccount->setImapSeentqStatus( folder(), imappath, false ); } } @@ -1618,18 +1618,18 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString& } // This is not perfect, what if the status didn't really change? Oh well ... -void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle) +void KMFolderCachedImap::setqStatus( int idx, KMMsgtqStatus status, bool toggle) { - KMFolderMaildir::seStatus( idx, status, toggle ); + KMFolderMaildir::setqStatus( idx, status, toggle ); const KMMsgBase *msg = getMsgBase( idx ); Q_ASSERT( msg ); if ( msg ) mUIDsOfLocallyChangedStatuses.insert( msg->UID() ); } -void KMFolderCachedImap::seStatus(TQValueList<int>& ids, KMMsgStatus status, bool toggle) +void KMFolderCachedImap::setqStatus(TQValueList<int>& ids, KMMsgtqStatus status, bool toggle) { - KMFolderMaildir::seStatus(ids, status, toggle); + KMFolderMaildir::setqStatus(ids, status, toggle); for (TQValueList<int>::iterator it = ids.begin(); it != ids.end(); it++ ) { const KMMsgBase *msg = getMsgBase( *it ); Q_ASSERT( msg ); @@ -1706,7 +1706,7 @@ bool KMFolderCachedImap::deleteMessages() if ( KMessageBox::warningYesNo( 0, i18n( "<qt><p>Mails on the server in folder <b>%1</b> were deleted. " "Do you want to delete them locally?<br>UIDs: %2</p></qt>" ) - .arg( folder()->prettyURL() ).arg( uids.join(",") ) ) == KMessageBox::Yes ) + .tqarg( folder()->prettyURL() ).tqarg( uids.join(",") ) ) == KMessageBox::Yes ) #endif removeMsg( msgsForDeletion ); } @@ -1929,9 +1929,9 @@ void KMFolderCachedImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & // be considered correct. if ( !mReadOnly || !GlobalSettings::allowLocalFlags() ) { /* The message is OK, update flags */ - KMFolderImap::flagsToStatus( existingMessage, flags, false, mReadOnly ? INT_MAX : mPermanentFlags ); + KMFolderImap::flagsTotqStatus( existingMessage, flags, false, mReadOnly ? INT_MAX : mPermanentFlags ); } else if ( mUserRights & KMail::ACLJobs::WriteSeenFlag ) { - KMFolderImap::seenFlagToStatus( existingMessage, flags ); + KMFolderImap::seenFlagTotqStatus( existingMessage, flags ); } } // kdDebug(5006) << "message with uid " << uid << " found in the local cache. " << endl; @@ -2055,7 +2055,7 @@ void KMFolderCachedImap::listNamespaces() mNamespacesToList.pop_front(); mSyncState = SYNC_STATE_LIST_SUBFOLDERS2; - newState( mProgress, i18n("Retrieving folders for namespace %1").arg(ns)); + newState( mProgress, i18n("Retrieving folders for namespace %1").tqarg(ns)); KMail::ListJob* job = new KMail::ListJob( mAccount, type, this, mAccount->addPathToNamespace( ns ) ); job->setNamespace( ns ); @@ -2297,7 +2297,7 @@ void KMFolderCachedImap::listDirectory2() // (could be that the folder was deleted & recreated meanwhile from another client...) if ( !locallyDeleted && mAccount->isPreviouslyDeletedFolder( subfolderPath ) ) { locallyDeleted = KMessageBox::warningYesNo( - 0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).arg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes; + 0, i18n( "<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it from the server?</p></qt>" ).tqarg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes; } if ( locallyDeleted ) { @@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState() KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem(); TQString str = i18n("Aborted"); if (progressItem) - progressItem->seStatus( str ); + progressItem->setqStatus( str ); emit statusMsg( str ); emit syncStateChanged(); } @@ -2606,21 +2606,21 @@ void KMFolderCachedImap::slotIncreaseProgress() mProgress += 5; } -void KMFolderCachedImap::newState( int progress, const TQString& syncStatus ) +void KMFolderCachedImap::newState( int progress, const TQString& synctqStatus ) { - //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << syncStatus << endl; + //kdDebug() << k_funcinfo << folder() << " " << mProgress << " " << synctqStatus << endl; KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem(); if( progressItem ) progressItem->setCompletedItems( progress ); - if ( !syncStatus.isEmpty() ) { + if ( !synctqStatus.isEmpty() ) { TQString str; // For a subfolder, show the label. But for the main folder, it's already shown. if ( mAccount->imapFolder() == this ) - str = syncStatus; + str = synctqStatus; else - str = TQString( "%1: %2" ).arg( label() ).arg( syncStatus ); + str = TQString( "%1: %2" ).tqarg( label() ).tqarg( synctqStatus ); if( progressItem ) - progressItem->seStatus( str ); + progressItem->setqStatus( str ); emit statusMsg( str ); } if( progressItem ) @@ -2809,7 +2809,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job ) // that's when the imap server doesn't support annotations if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() ) - KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).arg( mAccount->host() ) ); + KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).tqarg( mAccount->host() ) ); mAccount->setHasNoAnnotationSupport(); } else @@ -2837,7 +2837,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job ) // that's when the imap server doesn't support annotations if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() ) - KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).arg( mAccount->host() ) ); + KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).tqarg( mAccount->host() ) ); mAccount->setHasNoAnnotationSupport(); } else @@ -3063,7 +3063,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() bool manualMove = true; while ( GlobalSettings::autoLostFoundMove() ) { // find the inbox of this account - KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").arg( account()->id() ) ); + KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").tqarg( account()->id() ) ); if ( !inboxFolder ) { kdWarning(5006) << k_funcinfo << "inbox not found!" << endl; break; @@ -3095,7 +3095,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() break; // create subfolder for this incident - TQDate today = TQDate::currentDate(); + TQDate today = TQDate::tqcurrentDate(); TQString baseName = folder()->label() + "-" + TQString::number( today.year() ) + (today.month() < 10 ? "0" : "" ) + TQString::number( today.month() ) + (today.day() < 10 ? "0" : "" ) + TQString::number( today.day() ); @@ -3119,7 +3119,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() "on the server or you do not " "have sufficient access rights on the folder to upload them.</p>" "<p>All affected messages will therefore be moved to <b>%2</b> " - "to avoid data loss.</p>").arg( folder()->prettyURL() ).arg( dest->prettyURL() ), + "to avoid data loss.</p>").tqarg( folder()->prettyURL() ).tqarg( dest->prettyURL() ), i18n("Insufficient access rights") ); manualMove = false; break; @@ -3132,7 +3132,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() "have sufficient access rights on the folder now to upload them. " "Please contact your administrator to allow upload of new messages " "to you, or move them out of this folder.</p> " - "<p>Do you want to move these messages to another folder now?</p>").arg( folder()->prettyURL() ) ); + "<p>Do you want to move these messages to another folder now?</p>").tqarg( folder()->prettyURL() ) ); if ( KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) { KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(), i18n("Move Messages to Folder"), true ); diff --git a/kmail/kmfoldercachedimap.h b/kmail/kmfoldercachedimap.h index bd084f00a..dfef783ab 100644 --- a/kmail/kmfoldercachedimap.h +++ b/kmail/kmfoldercachedimap.h @@ -285,8 +285,8 @@ public: void setACLList( const ACLList& arr ); // Reimplemented so the mStatusChangedLocally bool can be set - virtual void seStatus( int id, KMMsgStatus status, bool toggle ); - virtual void seStatus( TQValueList<int>& ids, KMMsgStatus status, bool toggle ); + virtual void setqStatus( int id, KMMsgtqStatus status, bool toggle ); + virtual void setqStatus( TQValueList<int>& ids, KMMsgtqStatus status, bool toggle ); TQString annotationFolderType() const { return mAnnotationFolderType; } @@ -405,7 +405,7 @@ protected: virtual void timerEvent( TQTimerEvent* ); /* update progress status */ - void newState( int progress, const TQString& syncStatus ); + void newState( int progress, const TQString& synctqStatus ); /** See if there is a better parent then this folder */ KMFolderCachedImap* findParent( const TQString& path, const TQString& name ); @@ -590,7 +590,7 @@ private: bool mSharedSeenFlagsChanged; /** - * UIDs added by seStatus. Indicates that the client has changed + * UIDs added by setqStatus. Indicates that the client has changed * the status of those mails. The mail flags for changed mails will be * uploaded to the server, overwriting the server's notion of the status * of the mails in this folder. diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 3115aef33..d10e8cfac 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -61,7 +61,7 @@ #include <kpushbutton.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <tqregexp.h> #include <tqlabel.h> @@ -72,7 +72,7 @@ #include <assert.h> #include <tqhbuttongroup.h> #include <tqradiobutton.h> -#include <textedit.h> +#include <tqtextedit.h> #include "templatesconfiguration.h" #include "templatesconfiguration_kfg.h" @@ -100,7 +100,7 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, TQStringList folderNames; TQValueList<TQGuardedPtr<KMFolder> > folders; - // get all folders but search and folders that can not have children + // get all folders but search and folders that can not have tqchildren aParent->createFolderList(&folderNames, &folders, true, true, true, false, true, false); @@ -185,7 +185,7 @@ void KMFolderDialog::slotOk() mDelayedSavingTabs = 0; // number of tabs which need delayed saving for ( unsigned int i = 0 ; i < mTabs.count() ; ++i ) { - FolderDiaTab::AccepStatus s = mTabs[i]->accept(); + FolderDiaTab::AcceptqStatus s = mTabs[i]->accept(); if ( s == FolderDiaTab::Canceled ) { slotCancelAccept(); return; @@ -234,14 +234,14 @@ void KMFolderDialog::setFolder( KMFolder* folder ) mFolder = folder; } -static void addLine( TQWidget *parent, TQVBoxLayout* layout ) +static void addLine( TQWidget *parent, TQVBoxLayout* tqlayout ) { TQFrame *line = new TQFrame( parent, "line" ); line->setGeometry( TQRect( 80, 150, 250, 20 ) ); line->setFrameShape( TQFrame::HLine ); line->setFrameShadow( TQFrame::Sunken ); line->setFrameShape( TQFrame::HLine ); - layout->addWidget( line ); + tqlayout->addWidget( line ); } //---------------------------------------------------------------------------- @@ -331,7 +331,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, mNameEdit->setText( mDlg->folder() ? mDlg->folder()->label() : i18n("unnamed") ); if (!aName.isEmpty()) mNameEdit->setText(aName); - mNameEdit->setMinimumSize(mNameEdit->sizeHint()); + mNameEdit->setMinimumSize(mNameEdit->tqsizeHint()); // prevent renaming of IMAP inbox if ( mDlg->folder() && mDlg->folder()->isSystemFolder() ) { TQString imapPath; @@ -449,7 +449,7 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, addLine( this, topLayout ); - // use grid layout for the following combobox settings + // use grid tqlayout for the following combobox settings TQGridLayout *gl = new TQGridLayout( topLayout, 3, 2, KDialog::spacingHint() ); gl->setColStretch( 1, 100 ); // make the second column use all available space int row = -1; diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h index baec75f8a..230b4526f 100644 --- a/kmail/kmfolderdia.h +++ b/kmail/kmfolderdia.h @@ -83,12 +83,12 @@ public: /// @return whether save succeeded virtual bool save() = 0; - enum AccepStatus { Accepted, Canceled, Delayed }; + enum AcceptqStatus { Accepted, Canceled, Delayed }; /// Called when clicking OK. /// If a module returns Delayed, the closing is cancelled for now, /// and the module can close the dialog later on (i.e. after an async /// operation like a KIO job). - virtual AccepStatus accept() { + virtual AcceptqStatus accept() { return save() ? Accepted : Canceled; } diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp index 980d0b14b..77390e61b 100644 --- a/kmail/kmfolderdir.cpp +++ b/kmail/kmfolderdir.cpp @@ -206,7 +206,7 @@ bool KMFolderDir::reload(void) if (!dir.cd(fldPath, TRUE)) { - TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").arg(fldPath); + TQString msg = i18n("<qt>Cannot enter folder <b>%1</b>.</qt>").tqarg(fldPath); KMessageBox::information(0, msg); return FALSE; } @@ -214,7 +214,7 @@ bool KMFolderDir::reload(void) TQFileInfoList* fiList=(TQFileInfoList*)dir.entryInfoList(); if (!fiList) { - TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").arg(fldPath); + TQString msg = i18n("<qt>Folder <b>%1</b> is unreadable.</qt>").tqarg(fldPath); KMessageBox::information(0, msg); return FALSE; } @@ -258,7 +258,7 @@ bool KMFolderDir::reload(void) // For this to be a cached IMAP folder, it must be in the KMail dimap // subdir and must be have a uidcache file or be a maildir folder TQString maildir(fname + "/new"); - TQString imapcachefile = TQString::fromLatin1(".%1.uidcache").arg(fname); + TQString imapcachefile = TQString::tqfromLatin1(".%1.uidcache").tqarg(fname); if ( dir.exists( imapcachefile) || dir.exists( maildir ) ) { folder = new KMFolder( this, fname, KMFolderTypeCachedImap ); diff --git a/kmail/kmfolderdir.h b/kmail/kmfolderdir.h index 6d33add36..687f95637 100644 --- a/kmail/kmfolderdir.h +++ b/kmail/kmfolderdir.h @@ -55,7 +55,7 @@ public: /** Returns the folder manager that manages this folder */ virtual KMFolderMgr* manager() const; - /** Returns the folder whose children we are holding */ + /** Returns the folder whose tqchildren we are holding */ KMFolder* owner() const { return mOwner; } virtual KMFolderDirType type() const { return mDirType; } diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index 6f853038f..05a7864d1 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -56,8 +56,8 @@ using KMail::RenameJob; #include <kconfig.h> #include <tqbuffer.h> -#include <textcodec.h> -#include <stylesheet.h> +#include <tqtextcodec.h> +#include <tqstylesheet.h> #include <assert.h> @@ -245,7 +245,7 @@ void KMFolderImap::remove() jd.progressItem = ProgressManager::createProgressItem( "ImapFolderRemove" + ProgressManager::getUniqueID(), i18n("Removing folder"), - i18n( "URL: %1" ).arg( TQStyleSheet::escape( folder()->prettyURL() ) ), + i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ), false, account()->useSSL() || account()->useTLS() ); account()->insertJob(job, jd); @@ -488,7 +488,7 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex mAddMessageProgressItem = ProgressManager::createProgressItem( "Uploading"+ProgressManager::getUniqueID(), i18n("Uploading message data"), - i18n("Destination folder: %1").arg( TQStyleSheet::escape( folder()->prettyURL() ) ), + i18n("Destination folder: %1").tqarg( TQStyleSheet::escape( folder()->prettyURL() ) ), true, account()->useSSL() || account()->useTLS() ); mAddMessageProgressItem->setTotalItems( msgList.count() ); @@ -849,7 +849,7 @@ void KMFolderImap::slotListResult( const TQStringList& subfolderNames, // update progress account()->listDirProgressItem()->incCompletedItems(); account()->listDirProgressItem()->updateProgress(); - account()->listDirProgressItem()->seStatus( folder()->prettyURL() + i18n(" completed") ); + account()->listDirProgressItem()->setqStatus( folder()->prettyURL() + i18n(" completed") ); f->initializeFrom( this, subfolderPaths[i], subfolderMimeTypes[i] ); f->setChildrenState( subfolderAttributes[i] ); @@ -1003,11 +1003,11 @@ bool KMFolderImap::mailCheckInProgress() const //----------------------------------------------------------------------------- void KMFolderImap::setChildrenState( TQString attributes ) { - // update children state - if ( attributes.find( "haschildren", 0, false ) != -1 ) + // update tqchildren state + if ( attributes.find( "hastqchildren", 0, false ) != -1 ) { setHasChildren( FolderStorage::HasChildren ); - } else if ( attributes.find( "hasnochildren", 0, false ) != -1 || + } else if ( attributes.find( "hasnotqchildren", 0, false ) != -1 || attributes.find( "noinferiors", 0, false ) != -1 ) { setHasChildren( FolderStorage::HasNoChildren ); @@ -1073,7 +1073,7 @@ void KMFolderImap::checkValidity() mMailCheckProgressItem->setProgress(0); } if ( account()->mailCheckProgressItem() ) { - account()->mailCheckProgressItem()->seStatus( folder()->prettyURL() ); + account()->mailCheckProgressItem()->setqStatus( folder()->prettyURL() ); } ImapAccountBase::jobData jd( url.url() ); KIO::SimpleJob *job = KIO::get(url, false, false); @@ -1231,7 +1231,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) if (startUid.isEmpty()) { if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( i18n("Retrieving message status") ); + mMailCheckProgressItem->setqStatus( i18n("Retrieving message status") ); url.setPath(imapPath() + ";SECTION=UID FLAGS"); KIO::SimpleJob *job = KIO::listDir(url, false); KIO::Scheduler::assignJobToSlave(account()->slave(), job); @@ -1246,7 +1246,7 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) } else { mContentState = imapDownloadInProgress; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( i18n("Retrieving messages") ); + mMailCheckProgressItem->setqStatus( i18n("Retrieving messages") ); url.setPath(imapPath() + ";UID=" + startUid + ":*;SECTION=ENVELOPE"); KIO::SimpleJob *newJob = KIO::get(url, false, false); @@ -1271,7 +1271,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) if (job->error()) { account()->handleJobError( job, - i18n("Error while listing the contents of the folder %1.").arg( label() ) ); + i18n("Error while listing the contents of the folder %1.").tqarg( label() ) ); account()->removeJob(it); finishMailCheck( "listfolder", imapNoInformation ); return; @@ -1309,9 +1309,9 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) int supportedFlags = mUploadAllFlags ? 31 : mPermanentFlags; if ( mReadOnly ) supportedFlags = INT_MAX; - flagsToStatus( msgBase, serverFlags, false, supportedFlags ); + flagsTotqStatus( msgBase, serverFlags, false, supportedFlags ); } else - seenFlagToStatus( msgBase, serverFlags, false ); + seenFlagTotqStatus( msgBase, serverFlags, false ); idx++; uid = (*it).items.remove(uid); if ( msgBase->getMsgSerNum() > 0 ) { @@ -1341,7 +1341,7 @@ void KMFolderImap::slotListFolderResult(KIO::Job * job) mMailCheckProgressItem->setCompletedItems( 0 ); mMailCheckProgressItem->setTotalItems( jd.total ); mMailCheckProgressItem->setProgress( 0 ); - mMailCheckProgressItem->seStatus( i18n("Retrieving messages") ); + mMailCheckProgressItem->setqStatus( i18n("Retrieving messages") ); } TQStringList sets; @@ -1421,7 +1421,7 @@ void KMFolderImap::slotListFolderEntries(KIO::Job * job, //X } //----------------------------------------------------------------------------- -void KMFolderImap::flagsToStatus(KMMsgBase *msg, int flags, bool newMsg, int supportedFlags ) +void KMFolderImap::flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg, int supportedFlags ) { if ( !msg ) return; @@ -1440,45 +1440,45 @@ void KMFolderImap::flagsToStatus(KMMsgBase *msg, int flags, bool newMsg, int sup }; static const int numFlags = sizeof imapFlagMap / sizeof *imapFlagMap; - const KMMsgStatus oldStatus = msg->status(); + const KMMsgtqStatus oldtqStatus = msg->status(); for ( int i = 0; i < numFlags; ++i ) { if ( ( (supportedFlags & imapFlagMap[i].imapFlag) == 0 && (supportedFlags & 64) == 0 ) && !imapFlagMap[i].standardFlag ) { continue; } - if ( ((flags & imapFlagMap[i].imapFlag) > 0) != ((oldStatus & imapFlagMap[i].kmFlag) > 0) ) { - msg->toggleStatus( imapFlagMap[i].kmFlag ); + if ( ((flags & imapFlagMap[i].imapFlag) > 0) != ((oldtqStatus & imapFlagMap[i].kmFlag) > 0) ) { + msg->toggletqStatus( imapFlagMap[i].kmFlag ); } } - seenFlagToStatus( msg, flags, newMsg ); + seenFlagTotqStatus( msg, flags, newMsg ); } -void KMFolderImap::seenFlagToStatus(KMMsgBase * msg, int flags, bool newMsg) +void KMFolderImap::seenFlagTotqStatus(KMMsgBase * msg, int flags, bool newMsg) { if ( !msg ) return; - const KMMsgStatus oldStatus = msg->status(); - if ( (flags & 1) && (oldStatus & KMMsgStatusOld) == 0 ) - msg->seStatus( KMMsgStatusOld ); + const KMMsgtqStatus oldtqStatus = msg->status(); + if ( (flags & 1) && (oldtqStatus & KMMsgStatusOld) == 0 ) + msg->setqStatus( KMMsgStatusOld ); // In case the message does not have the seen flag set, override our local // notion that it is read. Otherwise the count of unread messages and the // number of messages which actually show up as read can go out of sync. - if ( msg->isOfUnknownStatus() || (!(flags&1) && !(oldStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) { + if ( msg->isOfUnknowntqStatus() || (!(flags&1) && !(oldtqStatus&(KMMsgStatusNew|KMMsgStatusUnread)) ) ) { if (newMsg) { - if ( (oldStatus & KMMsgStatusNew) == 0 ) - msg->seStatus( KMMsgStatusNew ); + if ( (oldtqStatus & KMMsgStatusNew) == 0 ) + msg->setqStatus( KMMsgStatusNew ); } else { - if ( (oldStatus & KMMsgStatusUnread) == 0 ) - msg->seStatus( KMMsgStatusUnread ); + if ( (oldtqStatus & KMMsgStatusUnread) == 0 ) + msg->setqStatus( KMMsgStatusUnread ); } } } //----------------------------------------------------------------------------- -TQString KMFolderImap::statusToFlags(KMMsgStatus status, int supportedFlags) +TQString KMFolderImap::statusToFlags(KMMsgtqStatus status, int supportedFlags) { TQString flags; if (status & KMMsgStatusDeleted) @@ -1596,14 +1596,14 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) } // Transfer the status, if it is cached. if ( md ) { - msg->seStatus( md->status() ); + msg->setqStatus( md->status() ); } else if ( !account()->hasCapability("uidplus") ) { // see if we have cached the msgIdMD5 and get the status + // serial number from there TQString id = msg->msgIdMD5(); if ( mMetaDataMap.find( id ) ) { md = mMetaDataMap[id]; - msg->seStatus( md->status() ); + msg->setqStatus( md->status() ); if ( md->serNum() != 0 && serNum == 0 ) { msg->setMsgSerNum( md->serNum() ); } @@ -1613,7 +1613,7 @@ void KMFolderImap::slotGetMessagesData(KIO::Job * job, const TQByteArray & data) } KMFolderMbox::addMsg(msg, 0); // Merge with the flags from the server. - flagsToStatus((KMMsgBase*)msg, flags, true, mUploadAllFlags ? 31 : mPermanentFlags); + flagsTotqStatus((KMMsgBase*)msg, flags, true, mUploadAllFlags ? 31 : mPermanentFlags); // set the correct size msg->setMsgSizeServer( msg->headerField("X-Length").toUInt() ); msg->setUID(uid); @@ -1880,15 +1880,15 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) } //----------------------------------------------------------------------------- -void KMFolderImap::seStatus(int idx, KMMsgStatus status, bool toggle) +void KMFolderImap::setqStatus(int idx, KMMsgtqStatus status, bool toggle) { TQValueList<int> ids; ids.append(idx); - seStatus(ids, status, toggle); + setqStatus(ids, status, toggle); } -void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle) +void KMFolderImap::setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle) { - FolderStorage::seStatus(_ids, status, toggle); + FolderStorage::setqStatus(_ids, status, toggle); TQValueList<int> ids; if ( mUploadAllFlags ) { kdDebug(5006) << k_funcinfo << "Migrating all flags to the server" << endl; @@ -1929,14 +1929,14 @@ void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool tog TQStringList sets = KMFolderImap::makeSets( seenUids, true ); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - account()->setImapSeenStatus( folder(), imappath, true ); + account()->setImapSeentqStatus( folder(), imappath, true ); } } if ( !unseenUids.isEmpty() ) { TQStringList sets = KMFolderImap::makeSets( unseenUids, true ); for( TQStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) { TQString imappath = imapPath() + ";UID=" + ( *it ); - account()->setImapSeenStatus( folder(), imappath, false ); + account()->setImapSeentqStatus( folder(), imappath, false ); } } return; @@ -1960,7 +1960,7 @@ void KMFolderImap::seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool tog // Send off a status setting job for each set. for ( TQStringList::Iterator slit = sets.begin(); slit != sets.end(); ++slit ) { TQString imappath = imapPath() + ";UID=" + ( *slit ); - account()->setImapStatus(folder(), imappath, flags); + account()->setImaptqStatus(folder(), imappath, flags); } } if ( mContentState == imapListingInProgress ) { @@ -2284,7 +2284,7 @@ void KMFolderImap::setSubfolderState( imapState state ) mSubfolderState = state; if ( state == imapNoInformation && folder()->child() ) { - // pass through to children + // pass through to tqchildren KMFolderNode* node; TQPtrListIterator<KMFolderNode> it( *folder()->child() ); for ( ; (node = it.current()); ) diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index 35abc648b..c7b31588f 100644 --- a/kmail/kmfolderimap.h +++ b/kmail/kmfolderimap.h @@ -61,15 +61,15 @@ using KPIM::ProgressItem; class KMMsgMetaData { public: - KMMsgMetaData(KMMsgStatus aStatus) - :mStatus(aStatus), mSerNum(0) {} - KMMsgMetaData(KMMsgStatus aStatus, TQ_UINT32 aSerNum) - :mStatus(aStatus), mSerNum(aSerNum) {} + KMMsgMetaData(KMMsgtqStatus atqStatus) + :mtqStatus(atqStatus), mSerNum(0) {} + KMMsgMetaData(KMMsgtqStatus atqStatus, TQ_UINT32 aSerNum) + :mtqStatus(atqStatus), mSerNum(aSerNum) {} ~KMMsgMetaData() {}; - KMMsgStatus status() const { return mStatus; } + KMMsgtqStatus status() const { return mtqStatus; } TQ_UINT32 serNum() const { return mSerNum; } private: - KMMsgStatus mStatus; + KMMsgtqStatus mtqStatus; TQ_UINT32 mSerNum; }; @@ -184,12 +184,12 @@ public: * Change the status of the message indicated by @p index * Overloaded function for the following one */ - virtual void seStatus(int idx, KMMsgStatus status, bool toggle); + virtual void setqStatus(int idx, KMMsgtqStatus status, bool toggle); /** * Change the status of several messages indicated by @p ids */ - virtual void seStatus(TQValueList<int>& _ids, KMMsgStatus status, bool toggle); + virtual void setqStatus(TQValueList<int>& _ids, KMMsgtqStatus status, bool toggle); /** generates sets of uids */ static TQStringList makeSets( TQValueList<ulong>&, bool sort = true); @@ -241,7 +241,7 @@ public: /** * Convert message status to a list of IMAP flags */ - static TQString statusToFlags(KMMsgStatus status, int supportedFalgs); + static TQString statusToFlags(KMMsgtqStatus status, int supportedFalgs); /** * Return the filename of the folder (reimplemented from KFolder) @@ -290,7 +290,7 @@ public: /** * Mark the folder as already removed from the server * If set to true the folder will only be deleted locally - * This will recursively be applied to all children + * This will recursively be applied to all tqchildren */ void setAlreadyRemoved(bool removed); @@ -380,13 +380,13 @@ public slots: * Convert IMAP flags to a message status * @param newMsg specifies whether unseen messages are new or unread */ - static void flagsToStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 ); + static void flagsTotqStatus(KMMsgBase *msg, int flags, bool newMsg = TRUE, int supportedFalgs = 31 ); /** * Convert IMAP seen flag to a message status. * @param newMsg specifies whether unseen messages are new or unread */ - static void seenFlagToStatus( KMMsgBase *msg, int flags, bool newMsg = true ); + static void seenFlagTotqStatus( KMMsgBase *msg, int flags, bool newMsg = true ); /** * Connected to the result signal of the copy/move job diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp index dd9cee72a..d41f6bca1 100644 --- a/kmail/kmfolderindex.cpp +++ b/kmail/kmfolderindex.cpp @@ -288,7 +288,7 @@ bool KMFolderIndex::readIndex() #ifdef OBSOLETE else if (mi->isNew()) { - mi->seStatus(KMMsgStatusUnread); + mi->setqStatus(KMMsgStatusUnread); mi->setDirty(false); } #endif @@ -369,7 +369,7 @@ bool KMFolderIndex::readIndexHeader(int *gv) "The mail index for '%1' is from an unknown version of KMail (%2).\n" "This index can be regenerated from your mail folder, but some " "information, including status flags, may be lost. Do you wish " - "to downgrade your index file?") .arg(name()) .arg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") ); + "to downgrade your index file?") .tqarg(name()) .tqarg(indexVersion), TQString(), i18n("Downgrade"), i18n("Do Not Downgrade") ); kapp->restoreOverrideCursor(); if (r == KMessageBox::Yes) createIndexFromContents(); @@ -467,7 +467,7 @@ bool KMFolderIndex::updateIndexStreamPtr(bool) } -KMFolderIndex::IndexStatus KMFolderIndex::indexStatus() +KMFolderIndex::IndextqStatus KMFolderIndex::indextqStatus() { if ( !mCompactable ) return IndexCorrupt; @@ -527,7 +527,7 @@ void KMFolderIndex::recreateIndex( bool readIndexAfterwards ) kapp->setOverrideCursor(KCursor::arrowCursor()); KMessageBox::information(0, i18n("The mail index for '%1' is corrupted and will be regenerated now, " - "but some information, like status flags, might get lost.").arg(name())); + "but some information, like status flags, might get lost.").tqarg(name())); kapp->restoreOverrideCursor(); createIndexFromContents(); if ( readIndexAfterwards ) { @@ -562,10 +562,10 @@ void KMFolderIndex::updateInvitationAndAddressFieldsFromContents() msg.fromDwString( msgString, false ); msg.updateInvitationState(); if ( msg.status() & KMMsgStatusHasInvitation ) { - msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasInvitation ); + msgInfo->setqStatus( msgInfo->status() | KMMsgStatusHasInvitation ); } if ( msg.status() & KMMsgStatusHasNoInvitation ) { - msgInfo->seStatus( msgInfo->status() | KMMsgStatusHasNoInvitation ); + msgInfo->setqStatus( msgInfo->status() | KMMsgStatusHasNoInvitation ); } msgInfo->setFrom( msg.from() ); msgInfo->setTo( msg.to() ); diff --git a/kmail/kmfolderindex.h b/kmail/kmfolderindex.h index 563fe5d6e..b0682ff00 100644 --- a/kmail/kmfolderindex.h +++ b/kmail/kmfolderindex.h @@ -45,9 +45,9 @@ class KMFolderIndex: public FolderStorage public: /** This enum indicates the status of the index file. It's returned by - indexStatus(). + indextqStatus(). */ - enum IndexStatus { IndexOk, + enum IndextqStatus { IndexOk, IndexMissing, IndexCorrupt, IndexTooOld @@ -91,7 +91,7 @@ public: Should return IndexOk if the folder doesn't exist anymore "physically" or if the index is not older than the contents. */ - virtual IndexStatus indexStatus() = 0; + virtual IndextqStatus indextqStatus() = 0; public slots: /** Incrementally update the index if possible else call writeIndex */ diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 1ae867bdc..6947bc78a 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -87,11 +87,11 @@ int KMFolderMaildir::canAccess() KCursorSaver idle(KBusyPtr::idle()); if ( nRetVal == ENOENT ) KMessageBox::sorry(0, i18n("Error opening %1; this folder is missing.") - .arg(sBadFolderName)); + .tqarg(sBadFolderName)); else KMessageBox::sorry(0, i18n("Error opening %1; either this is not a valid " "maildir folder, or you do not have sufficient access permissions.") - .arg(sBadFolderName)); + .tqarg(sBadFolderName)); return nRetVal; } @@ -117,12 +117,12 @@ int KMFolderMaildir::open(const char *) if (!folder()->path().isEmpty()) { - if (KMFolderIndex::IndexOk != indexStatus()) // test if contents file has changed + if (KMFolderIndex::IndexOk != indextqStatus()) // test if contents file has changed { TQString str; mIndexStream = 0; str = i18n("Folder `%1' changed; recreating index.") - .arg(name()); + .tqarg(name()); emit statusMsg(str); } else { mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file @@ -310,7 +310,7 @@ int KMFolderMaildir::compact( unsigned int startIndex, int nbMessages, const TQS // we can't have any New messages at this point if (mi->isNew()) { - mi->seStatus(KMMsgStatusUnread); + mi->setqStatus(KMMsgStatusUnread); setDirty( true ); } #endif @@ -506,7 +506,7 @@ if( fileD0.open( IO_WriteOnly ) ) { error |= appendToFolderIdsFile( idx ); if (error) { - kdDebug(5006) << "Error: Could not add message to folder (No space left on device?)" << endl; + kdDebug(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl; if (ftell(mIndexStream) > revert) { kdDebug(5006) << "Undoing changes" << endl; truncate( TQFile::encodeName(indexLocation()), revert ); @@ -519,7 +519,7 @@ if( fileD0.open( IO_WriteOnly ) ) { if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on device or insufficient quota?)\n" + "(No space left on tqdevice or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); */ @@ -583,7 +583,7 @@ DwString KMFolderMaildir::getDwString(int idx) } -void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status) +void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status) { // we keep our current directory to restore it later char path_buffer[PATH_MAX]; @@ -903,7 +903,7 @@ int KMFolderMaildir::createIndexFromContents() return 0; } -KMFolderIndex::IndexStatus KMFolderMaildir::indexStatus() +KMFolderIndex::IndextqStatus KMFolderMaildir::indextqStatus() { if ( !mCompactable ) return KMFolderIndex::IndexCorrupt; @@ -1033,7 +1033,7 @@ static KStaticDeleter<TQRegExp> suffix_regex_sd; //----------------------------------------------------------------------------- // static TQString KMFolderMaildir::constructValidFileName( const TQString & filename, - KMMsgStatus status ) + KMMsgtqStatus status ) { TQString aFileName( filename ); @@ -1075,7 +1075,7 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n } //----------------------------------------------------------------------------- -TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status) +TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status) { TQString dest(newLoc); // make sure that our destination filename doesn't already exist @@ -1096,13 +1096,13 @@ TQString KMFolderMaildir::moveInternal(const TQString& oldLoc, const TQString& n } //----------------------------------------------------------------------------- -void KMFolderMaildir::msgStatusChanged(const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, int idx) +void KMFolderMaildir::msgStatusChanged(const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx) { // if the status of any message changes, then we need to compact needsCompact = true; - KMFolderIndex::msgStatusChanged(oldStatus, newStatus, idx); + KMFolderIndex::msgStatusChanged(oldtqStatus, newtqStatus, idx); } /*virtual*/ diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h index c16d64f0b..ea02d9b11 100644 --- a/kmail/kmfoldermaildir.h +++ b/kmail/kmfoldermaildir.h @@ -56,10 +56,10 @@ public: virtual void removeMsg(TQPtrList<KMMessage> msgList, bool imapQuiet = FALSE) { return KMFolderIndex::removeMsg(msgList, imapQuiet); } - // Called by KMMsgBase::seStatus when status of a message has changed + // Called by KMMsgBase::setqStatus when status of a message has changed // required to keep the number unread messages variable current. - virtual void msgStatusChanged( const KMMsgStatus oldStatus, - const KMMsgStatus newStatus, + virtual void msgStatusChanged( const KMMsgtqStatus oldtqStatus, + const KMMsgtqStatus newtqStatus, int idx); /** Open folder for access. @@ -87,7 +87,7 @@ public: static int createMaildirFolders( const TQString & folderPath ); static TQString constructValidFileName( const TQString & filename = TQString(), - KMMsgStatus status = KMMsgStatusNew ); + KMMsgtqStatus status = KMMsgStatusNew ); static bool removeFile( const TQString & folderPath, const TQString & filename ); @@ -148,9 +148,9 @@ private slots: void slotDirSizeJobResult( KIO::Job* job ); private: - void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgStatus status); + void readFileHeaderIntern(const TQString& dir, const TQString& file, KMMsgtqStatus status); TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, KMMsgInfo* mi); - TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgStatus status); + TQString moveInternal(const TQString& oldLoc, const TQString& newLoc, TQString& aFileName, KMMsgtqStatus status); bool removeFile(const TQString& filename); /** Tests whether the contents of this folder is newer than the index. @@ -158,7 +158,7 @@ private: Returns IndexMissing if there is no index. Returns IndexOk if the index is not older than the contents. */ - virtual IndexStatus indexStatus(); + virtual IndextqStatus indextqStatus(); typedef TQPair<TQGuardedPtr<const KMFolderMaildir>,KFileItemList> DirSizeJobQueueEntry; static TQValueList<DirSizeJobQueueEntry> s_DirSizeJobQueue; diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index deaa69edd..a53a4be1b 100644 --- a/kmail/kmfoldermbox.cpp +++ b/kmail/kmfoldermbox.cpp @@ -109,7 +109,7 @@ int KMFolderMbox::open(const char *owner) if (!mStream) { KNotifyClient::event( 0, "warning", - i18n("Cannot open file \"%1\":\n%2").arg(location()).arg(strerror(errno))); + i18n("Cannot open file \"%1\":\n%2").tqarg(location()).tqarg(strerror(errno))); kdDebug(5006) << "Cannot open folder `" << location() << "': " << strerror(errno) << endl; mOpenCount = 0; return errno; @@ -119,7 +119,7 @@ int KMFolderMbox::open(const char *owner) if (!folder()->path().isEmpty()) { - KMFolderIndex::IndexStatus index_status = indexStatus(); + KMFolderIndex::IndextqStatus index_status = indextqStatus(); // test if index file exists and is up-to-date if (KMFolderIndex::IndexOk != index_status) { @@ -137,8 +137,8 @@ int KMFolderMbox::open(const char *owner) "of KMail</a> for " "information about how to prevent this " "problem from happening again.</p></qt>") - .arg("help:/kmail/faq.html#faq-index-regeneration") - .arg(name()); + .tqarg("help:/kmail/faq.html#faq-index-regeneration") + .tqarg(name()); // When KMail is starting up we have to show a non-blocking message // box so that the initialization can continue. We don't show a // queued message box when KMail isn't starting up because queued @@ -164,7 +164,7 @@ int KMFolderMbox::open(const char *owner) TQString str; mIndexStream = 0; str = i18n("Folder `%1' changed. Recreating index.") - .arg(name()); + .tqarg(name()); emit statusMsg(str); } else { mIndexStream = fopen(TQFile::encodeName(indexLocation()), "r+"); // index file @@ -262,7 +262,7 @@ void KMFolderMbox::reallyDoClose(const char* owner) Q_UNUSED( owner ); if (mAutoCreateIndex) { - if (KMFolderIndex::IndexOk != indexStatus()) { + if (KMFolderIndex::IndexOk != indextqStatus()) { kdDebug(5006) << "Critical error: " << location() << " has been modified by an external application while KMail was running." << endl; // exit(1); backed out due to broken nfs @@ -297,7 +297,7 @@ void KMFolderMbox::sync() if (mOpenCount > 0) if (!mStream || fsync(fileno(mStream)) || !mIndexStream || fsync(fileno(mIndexStream))) { - kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").arg( indexLocation() ).arg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug."))); + kmkernel->emergencyExit( i18n("Could not sync index file <b>%1</b>: %2").tqarg( indexLocation() ).tqarg(errno ? TQString::fromLocal8Bit(strerror(errno)) : i18n("Internal error. Please copy down the details and report a bug."))); } } @@ -521,7 +521,7 @@ int KMFolderMbox::unlock() //----------------------------------------------------------------------------- -KMFolderIndex::IndexStatus KMFolderMbox::indexStatus() +KMFolderIndex::IndextqStatus KMFolderMbox::indextqStatus() { if ( !mCompactable ) return KMFolderIndex::IndexCorrupt; @@ -555,8 +555,8 @@ int KMFolderMbox::createIndexFromContents() KMMsgInfo* mi; TQString msgStr; TQRegExp regexp(MSG_SEPERATOR_REGEX); - int i, num, numStatus; - short needStatus; + int i, num, numtqStatus; + short needtqStatus; assert(mStream != 0); rewind(mStream); @@ -564,7 +564,7 @@ int KMFolderMbox::createIndexFromContents() mMsgList.clear(); num = -1; - numStatus= 11; + numtqStatus= 11; off_t offs = 0; size_t size = 0; dateStr = ""; @@ -578,7 +578,7 @@ int KMFolderMbox::createIndexFromContents() replyToAuxIdStr = ""; referencesStr = ""; msgIdStr = ""; - needStatus = 3; + needtqStatus = 3; size_t sizeServer = 0; ulong uid = 0; @@ -597,11 +597,11 @@ int KMFolderMbox::createIndexFromContents() if (num >= 0) { - if (numStatus <= 0) + if (numtqStatus <= 0) { msgStr = i18n("Creating index file: one message done", "Creating index file: %n messages done", num); emit statusMsg(msgStr); - numStatus = 10; + numtqStatus = 10; } if (size > 0) @@ -682,14 +682,14 @@ int KMFolderMbox::createIndexFromContents() replyToIdStr, replyToAuxIdStr, msgIdStr, KMMsgEncryptionStateUnknown, KMMsgSignatureStateUnknown, KMMsgMDNStateUnknown, charset, offs, size, sizeServer, uid ); - mi->seStatus(status, xstatus); + mi->setqStatus(status, xstatus); mi->setDate( dateStr.stripWhiteSpace().data() ); mi->setDirty(false); mMsgList.append(mi, mExportsSernums ); *status = '\0'; *xstatus = '\0'; - needStatus = 3; + needtqStatus = 3; xmarkStr = ""; replyToIdStr = ""; replyToAuxIdStr = ""; @@ -701,12 +701,12 @@ int KMFolderMbox::createIndexFromContents() sizeServer = 0; uid = 0; } - else num--,numStatus++; + else num--,numtqStatus++; } offs = ftell(mStream); num++; - numStatus--; + numtqStatus--; inHeader = true; continue; } @@ -727,19 +727,19 @@ int KMFolderMbox::createIndexFromContents() /* -sanders Make all messages read when auto-recreating index */ /* Reverted, as it breaks reading the sent mail status, for example. -till */ - if ((needStatus & 1) && strncasecmp(line, "Status:", 7) == 0) + if ((needtqStatus & 1) && strncasecmp(line, "Status:", 7) == 0) { for(i=0; i<4 && line[i+8] > ' '; i++) status[i] = line[i+8]; status[i] = '\0'; - needStatus &= ~1; + needtqStatus &= ~1; } - else if ((needStatus & 2) && strncasecmp(line, "X-Status:", 9)==0) + else if ((needtqStatus & 2) && strncasecmp(line, "X-Status:", 9)==0) { for(i=0; i<4 && line[i+10] > ' '; i++) xstatus[i] = line[i+10]; xstatus[i] = '\0'; - needStatus &= ~2; + needtqStatus &= ~2; } else if (strncasecmp(line,"X-KMail-Mark:",13)==0) xmarkStr = TQCString(line+13); @@ -1047,7 +1047,7 @@ if( fileD1.open( IO_WriteOnly ) ) { if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on device or insufficient quota?)\n" + "(No space left on tqdevice or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); kmkernel->kbp()->idle(); @@ -1118,7 +1118,7 @@ if( fileD1.open( IO_WriteOnly ) ) { error |= appendToFolderIdsFile( idx ); if (error) { - kdWarning(5006) << "Error: Could not add message to folder (No space left on device?)" << endl; + kdWarning(5006) << "Error: Could not add message to folder (No space left on tqdevice?)" << endl; if (ftell(mIndexStream) > revert) { kdWarning(5006) << "Undoing changes" << endl; truncate( TQFile::encodeName(indexLocation()), revert ); @@ -1126,14 +1126,14 @@ if( fileD1.open( IO_WriteOnly ) ) { if ( errno ) kmkernel->emergencyExit( i18n("Could not add message to folder:") + TQString::fromLocal8Bit(strerror(errno))); else - kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on device?)") ); + kmkernel->emergencyExit( i18n("Could not add message to folder (No space left on tqdevice?)") ); /* This code may not be 100% reliable bool busy = kmkernel->kbp()->isBusy(); if (busy) kmkernel->kbp()->idle(); KMessageBox::sorry(0, i18n("Unable to add message to folder.\n" - "(No space left on device or insufficient quota?)\n" + "(No space left on tqdevice or insufficient quota?)\n" "Free space and sufficient quota are required to continue safely.")); if (busy) kmkernel->kbp()->busy(); */ @@ -1237,7 +1237,7 @@ int KMFolderMbox::compact( bool silent ) // Note that job autodeletes itself. // If this is the current folder, the changed signal will ultimately call - // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it + // KMHeaders::setFolderInfotqStatus which will override the message, so save/restore it TQString statusMsg = BroadcastStatus::instance()->statusMsg(); emit changed(); BroadcastStatus::instance()->seStatusMsg( statusMsg ); diff --git a/kmail/kmfoldermbox.h b/kmail/kmfoldermbox.h index 68b52acad..d37411447 100644 --- a/kmail/kmfoldermbox.h +++ b/kmail/kmfoldermbox.h @@ -39,7 +39,7 @@ using KMail::AttachmentStrategy; * * Accounts: * The accounts (of KMail) that are fed into the folder are - * represented as the children of the folder. They are only stored here + * represented as the tqchildren of the folder. They are only stored here * during runtime to have a reference for which accounts point to a * specific folder. */ @@ -110,7 +110,7 @@ public: static TQByteArray escapeFrom( const DwString & str ); - virtual IndexStatus indexStatus(); + virtual IndextqStatus indextqStatus(); /** reimp */ virtual TQ_INT64 doFolderSize() const; diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index 34958e5a7..c4df4904d 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -146,7 +146,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath) if ( !info.isDir() ) { KMessageBox::sorry(0, i18n("'%1' does not appear to be a folder.\n" "Please move the file out of the way.") - .arg( mBasePath ) ); + .tqarg( mBasePath ) ); ::exit(-1); } if ( !info.isReadable() || !info.isWritable() ) { @@ -154,7 +154,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath) "incorrect;\n" "please make sure that you can view and modify " "the content of this folder.") - .arg( mBasePath ) ); + .tqarg( mBasePath ) ); ::exit(-1); } } else { @@ -163,7 +163,7 @@ void KMFolderMgr::setBasePath(const TQString& aBasePath) KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n" "please make sure that you can view and " "modify the content of the folder '%2'.") - .arg( mBasePath ).arg( TQDir::homeDirPath() ) ); + .tqarg( mBasePath ).tqarg( TQDir::homeDirPath() ) ); ::exit(-1); } } @@ -326,7 +326,7 @@ KMFolder* KMFolderMgr::findOrCreate(const TQString& aFolderName, bool sysFldr, folder = createFolder(aFolderName, sysFldr, type); if (!folder) { - KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(aFolderName).arg(mBasePath))); + KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(aFolderName).tqarg(mBasePath))); exit(-1); } if ( id > 0 ) @@ -402,7 +402,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) // aFolder will be deleted by the next call! aFolder->parent()->remove(aFolder); - // update the children state + // update the tqchildren state if ( parentF ) { if ( parentF != aFolder ) diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index 57d9f9759..fd841ae6a 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -11,7 +11,7 @@ #include <kpopupmenu.h> #include <kiconloader.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtoolbutton.h> #include <tqlabel.h> @@ -65,7 +65,7 @@ void KMFolderSelDlg::init() connect( mTreeView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), this, TQT_SLOT( slotSelect() ) ); connect( mTreeView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotUpdateBtnStatus() ) ); + this, TQT_SLOT( slotUpdateBtntqStatus() ) ); readConfig(); } @@ -107,7 +107,7 @@ void KMFolderSelDlg::slotUser1() } //----------------------------------------------------------------------------- -void KMFolderSelDlg::slotUpdateBtnStatus() +void KMFolderSelDlg::slotUpdateBtntqStatus() { enableButton( User1, folder() && ( !folder()->noContent() && !folder()->noChildren() ) ); diff --git a/kmail/kmfolderseldlg.h b/kmail/kmfolderseldlg.h index 2d699b80b..edc5f6a74 100644 --- a/kmail/kmfolderseldlg.h +++ b/kmail/kmfolderseldlg.h @@ -58,7 +58,7 @@ namespace KMail { protected slots: void slotSelect(); void slotUser1(); - void slotUpdateBtnStatus(); + void slotUpdateBtntqStatus(); protected: void readConfig(); diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 63010f9b5..aef19abe4 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -267,14 +267,14 @@ void KMFolderTreeItem::slotIconsChanged() else setPixmap( 0, normalIcon( iconSize() ) ); emit iconChanged( this ); - repaint(); + tqrepaint(); } void KMFolderTreeItem::slotNameChanged() { setText( 0, mFolder->label() ); emit nameChanged( this ); - repaint(); + tqrepaint(); } void KMFolderTreeItem::slotNoContentChanged() @@ -495,7 +495,7 @@ void KMFolderTree::readConfig (void) setFont(KGlobalSettings::generalFont()); } - // restore the layout + // restore the tqlayout restoreLayout(conf, "Geometry"); } @@ -510,7 +510,7 @@ void KMFolderTree::writeConfig() writeIsListViewItemOpen(fti); } - // save the current layout + // save the current tqlayout saveLayout(KMKernel::config(), "Geometry"); } @@ -556,7 +556,7 @@ void KMFolderTree::reload(bool openFolders) int top = contentsY(); mLastItem = 0; - // invalidate selected drop item + // tqinvalidate selected drop item oldSelected = 0; // remember last KMFolder* last = currentFolder(); @@ -743,7 +743,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) // create new child fti = new KMFolderTreeItem( parent, folder->label(), folder ); - // set folders explicitely to exandable when they have children + // set folders explicitely to exandable when they have tqchildren // this way we can do a listing for IMAP folders when the user expands them // even when the child folders are not created yet if ( folder->storage()->hasChildren() == FolderStorage::HasChildren ) { @@ -800,7 +800,7 @@ void KMFolderTree::delayedUpdate() continue; if ( fti->needsRepaint() ) { - fti->repaint(); + fti->tqrepaint(); fti->setNeedsRepaint( false ); } } @@ -918,7 +918,7 @@ bool KMFolderTree::checkUnreadFolder (KMFolderTreeItem* fti, bool confirm) // parameter (kept in the config file for kmail) if ( KMessageBox::questionYesNo( this, i18n( "<qt>Go to the next unread message in folder <b>%1</b>?</qt>" ) - .arg( fti->folder()->label() ), + .tqarg( fti->folder()->label() ), i18n( "Go to Next Unread Message" ), i18n("Go To"), i18n("Do Not Go To"), // defaults "AskNextFolder", @@ -1280,7 +1280,7 @@ void KMFolderTree::addChildFolder( KMFolder *folder, TQWidget * parent ) const TQString message = i18n( "<qt>Cannot create folder under <b>%1</b> because of insufficient " "permissions on the server. If you think you should be able to create " "subfolders here, ask your administrator to grant you rights to do so." - "</qt> " ).arg(aFolder->label()); + "</qt> " ).tqarg(aFolder->label()); KMessageBox::error( this, message ); return; } @@ -1419,7 +1419,7 @@ void KMFolderTree::openFolder() autoopen_timer.stop(); if ( dropItem && !dropItem->isOpen() ) { dropItem->setOpen( true ); - dropItem->repaint(); + dropItem->tqrepaint(); } } @@ -1467,7 +1467,7 @@ void KMFolderTree::contentsDragMoveEvent( TQDragMoveEvent *e ) } if ( dragAccepted ) { - e->accept( itemRect(i) ); + e->accept( tqitemRect(i) ); switch ( e->action() ) { case TQDropEvent::Copy: @@ -1987,7 +1987,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( sourceFolderName ) ) { KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same name already exists.</qt>") - .arg( sourceFolderName ) ); + .tqarg( sourceFolderName ) ); setDragEnabled( true ); return; } @@ -1998,7 +1998,7 @@ void KMFolderTree::moveOrCopyFolder( TQValueList<TQGuardedPtr<KMFolder> > source while ( f ) { if ( f->moveInProgress() ) { KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied itself.</qt>") - .arg( sourceFolderName ) ); + .tqarg( sourceFolderName ) ); setDragEnabled( true ); return; } diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 5515c8489..987f9aa06 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -49,7 +49,7 @@ using namespace KPIM; #include <tqptrstack.h> #include <tqptrqueue.h> #include <tqpainter.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqstyle.h> #include <tqlistview.h> @@ -329,7 +329,7 @@ void KMHeaders::slotToggleColumn(int id, int mode) } case KPaintInfo::COL_STATUS: { - show = &mPaintInfo.showStatus; + show = &mPaintInfo.showtqStatus; col = &mPaintInfo.statusCol; width = pixNew->width() + 8; if ( *col == header()->mapToIndex( *col ) ) @@ -409,7 +409,7 @@ void KMHeaders::paintEmptyArea( TQPainter * p, const TQRect & rect ) rect.left() + contentsX(), rect.top() + contentsY() ); else - p->fillRect( rect, colorGroup().base() ); + p->fillRect( rect, tqcolorGroup().base() ); } bool KMHeaders::event(TQEvent *e) @@ -429,10 +429,10 @@ void KMHeaders::readColorConfig (void) KConfig* config = KMKernel::config(); // Custom/System colors KConfigGroupSaver saver(config, "Reader"); - TQColor c1=TQColor(kapp->palette().active().text()); + TQColor c1=TQColor(kapp->tqpalette().active().text()); TQColor c2=TQColor("red"); TQColor c3=TQColor("blue"); - TQColor c4=TQColor(kapp->palette().active().base()); + TQColor c4=TQColor(kapp->tqpalette().active().base()); TQColor c5=TQColor(0,0x7F,0); TQColor c6=TQColor(0,0x98,0); TQColor c7=KGlobalSettings::alternateBackgroundColor(); @@ -669,7 +669,7 @@ void KMHeaders::writeConfig (void) config->writeEntry("showTodoColumn" , mPaintInfo.showTodo); config->writeEntry("showSpamHamColumn" , mPaintInfo.showSpamHam); config->writeEntry("showWatchedIgnoredColumn", mPaintInfo.showWatchedIgnored); - config->writeEntry("showStatusColumn" , mPaintInfo.showStatus); + config->writeEntry("showStatusColumn" , mPaintInfo.showtqStatus); config->writeEntry("showSignedColumn" , mPaintInfo.showSigned); config->writeEntry("showCryptoColumn" , mPaintInfo.showCrypto); config->writeEntry("showReceiverColumn" , mPaintInfo.showReceiver); @@ -700,7 +700,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) highlightMessage(0, false); disconnect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfoStatus())); + this, TQT_SLOT(setFolderInfotqStatus())); mFolder->markNewAsUnread(); writeFolderConfig(); @@ -754,7 +754,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)), BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) ); connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfoStatus())); + this, TQT_SLOT(setFolderInfotqStatus())); connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); // Not very nice, but if we go from nested to non-nested @@ -789,7 +789,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) END_TIMER(updateMsg); SHOW_TIMER(updateMsg); makeHeaderVisible(); - setFolderInfoStatus(); + setFolderInfotqStatus(); TQString colText = i18n( "Sender" ); if (mFolder && (mFolder->whoField().lower() == "to") && !mPaintInfo.showReceiver) @@ -831,7 +831,7 @@ void KMHeaders::msgChanged() const bool scrollbarAtBottom = verticalScrollBar() && verticalScrollBar()->value() == verticalScrollBar()->maxValue(); const HeaderItem * const oldFirstVisibleItem = dynamic_cast<HeaderItem*>( itemAt( TQPoint( 0, 0 ) ) ); - const int oldOffsetOfFirstVisibleItem = itemRect( oldFirstVisibleItem ).y(); + const int oldOffsetOfFirstVisibleItem = tqitemRect( oldFirstVisibleItem ).y(); const uint oldSerNumOfFirstVisibleItem = oldFirstVisibleItem ? oldFirstVisibleItem->msgSerNum() : 0; TQString msgIdMD5; @@ -935,9 +935,9 @@ void KMHeaders::msgAdded(int id) } if (parent && mFolder->getMsgBase(parent->id())->isWatched()) - mFolder->getMsgBase(id)->seStatus( KMMsgStatusWatched ); + mFolder->getMsgBase(id)->setqStatus( KMMsgStatusWatched ); else if (parent && mFolder->getMsgBase(parent->id())->isIgnored()) - mFolder->getMsgBase(id)->seStatus( KMMsgStatusIgnored ); + mFolder->getMsgBase(id)->setqStatus( KMMsgStatusIgnored ); if (parent) hi = new HeaderItem( parent->item(), id ); else @@ -1115,7 +1115,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) if ( mSubjThreading && removedItem->sortCacheItem()->subjectThreadingList() ) removedItem->sortCacheItem()->subjectThreadingList()->removeRef( removedItem->sortCacheItem() ); - // Reparent children of item. + // Reparent tqchildren of item. TQListViewItem *myParent = removedItem; TQListViewItem *myChild = myParent->firstChild(); TQListViewItem *threadRoot = myParent; @@ -1214,13 +1214,13 @@ void KMHeaders::msgHeaderChanged(KMFolder*, int msgId) HeaderItem *item = mItems[msgId]; if (item) { item->irefresh(); - item->repaint(); + item->tqrepaint(); } } //----------------------------------------------------------------------------- -void KMHeaders::setMsgStatus (KMMsgStatus status, bool toggle) +void KMHeaders::setMsgtqStatus (KMMsgtqStatus status, bool toggle) { // kdDebug() << k_funcinfo << endl; SerNumList serNums = selectedVisibleSernums(); @@ -1254,7 +1254,7 @@ TQPtrList<TQListViewItem> KMHeaders::currentThread() const return list; } -void KMHeaders::setThreadStatus(KMMsgStatus status, bool toggle) +void KMHeaders::setThreadtqStatus(KMMsgtqStatus status, bool toggle) { TQPtrList<TQListViewItem> curThread; @@ -1372,9 +1372,9 @@ void KMHeaders::setStyleDependantFrameWidth() // set the width of the frame to a reasonable value for the current GUI style int frameWidth; if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) @@ -1389,7 +1389,7 @@ void KMHeaders::styleChange( TQStyle& oldStyle ) } //----------------------------------------------------------------------------- -void KMHeaders::setFolderInfoStatus () +void KMHeaders::setFolderInfotqStatus () { if ( !mFolder ) return; TQString str; @@ -1399,10 +1399,10 @@ void KMHeaders::setFolderInfoStatus () else str = unread ? i18n( "1 unread", "%n unread", unread ) : i18n( "0 unread" ); const int count = mFolder->count(); - str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).arg( str ) + str = count ? i18n( "1 message, %1.", "%n messages, %1.", count ).tqarg( str ) : i18n( "0 messages" ); // no need for "0 unread" to be added here if ( mFolder->isReadOnly() ) - str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").arg( str ); + str = i18n("%1 = n messages, m unread.", "%1 Folder is read-only.").tqarg( str ); BroadcastStatus::instance()->seStatusMsg(str); } @@ -1451,7 +1451,7 @@ void KMHeaders::applyFiltersOnMsg() if ( msgCountToFilter - msgCount < 10 || !( msgCount % 20 ) || msgCount <= 10 ) { progressItem->updateProgress(); TQString statusMsg = i18n("Filtering message %1 of %2"); - statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); + statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter ); KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg ); KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } @@ -1624,7 +1624,7 @@ void KMHeaders::slotMoveCompleted( KMCommand *command ) deleted ? i18n("Messages deleted successfully.") : i18n("Messages moved successfully") ); } else { /* The move failed or the user canceled it; reset the state of all - * messages involved and repaint. + * messages involved and tqrepaint. * * Note: This potentially resets too many items if there is more than one * move going on. Oh well, I suppose no animals will be harmed. @@ -1701,7 +1701,7 @@ void KMHeaders::setCurrentMsg(int cur) setSelectionAnchor( currentItem() ); } makeHeaderVisible(); - setFolderInfoStatus(); + setFolderInfotqStatus(); } //----------------------------------------------------------------------------- @@ -1714,7 +1714,7 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected ) KListView::setSelected( item, selected ); // If the item is the parent of a closed thread recursively select - // children . + // tqchildren . if ( isThreaded() && !item->isOpen() && item->firstChild() ) { TQListViewItem *nextRoot = item->itemBelow(); TQListViewItemIterator it( item->firstChild() ); @@ -1828,12 +1828,12 @@ void KMHeaders::selectNextMessage() temp->firstChild(); temp = temp->parent(); } - lvi->repaint(); + lvi->tqrepaint(); /* test to see if we need to unselect messages on back track */ (below->isSelected() ? setSelected(lvi, false) : setSelected(below, true)); setCurrentItem(below); makeHeaderVisible(); - setFolderInfoStatus(); + setFolderInfotqStatus(); } } } @@ -1866,12 +1866,12 @@ void KMHeaders::selectPrevMessage() temp->firstChild(); temp = temp->parent(); } - lvi->repaint(); + lvi->tqrepaint(); /* test to see if we need to unselect messages on back track */ (above->isSelected() ? setSelected(lvi, false) : setSelected(above, true)); setCurrentItem(above); makeHeaderVisible(); - setFolderInfoStatus(); + setFolderInfotqStatus(); } } } @@ -1997,7 +1997,7 @@ int KMHeaders::findUnread(bool aDirNext, int aStartAt, bool onlyNew, bool accept // first unread item. // // Find the ancestor of the unread item closest to the - // root and recursively sort all of that ancestors children. + // root and recursively sort all of that ancestors tqchildren. if (item) { TQListViewItem *next = item; while (next->parent()) @@ -2138,9 +2138,9 @@ void KMHeaders::highlightMessage(TQListViewItem* lvi, bool markitread) BroadcastStatus::instance()->seStatusMsg(""); if (markitread && idx >= 0) setMsgRead(idx); mItems[idx]->irefresh(); - mItems[idx]->repaint(); + mItems[idx]->tqrepaint(); emit selected( msg ); - setFolderInfoStatus(); + setFolderInfotqStatus(); } void KMHeaders::highlightCurrentThread() @@ -2151,7 +2151,7 @@ void KMHeaders::highlightCurrentThread() for ( it.toFirst() ; it.current() ; ++it ) { TQListViewItem *lvi = *it; lvi->setSelected( true ); - lvi->repaint(); + lvi->tqrepaint(); } } @@ -2192,7 +2192,7 @@ void KMHeaders::updateMessageList( bool set_selection, bool forceJumpToUnread ) noRepaint = false; KListView::setSorting( mSortCol, !mSortDescending ); if (!mFolder) { - repaint(); + tqrepaint(); return; } readSortOrder( set_selection, forceJumpToUnread ); @@ -2290,7 +2290,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) if ( rootDecoClicked ) { // Check if our item is the parent of a closed thread and if so, if the root // decoration of the item was clicked (i.e. the +/- sign) which would expand - // the thread. In that case, deselect all children, so opening the thread + // the thread. In that case, deselect all tqchildren, so opening the thread // doesn't cause a flicker. if ( !lvi->isOpen() && lvi->firstChild() ) { TQListViewItem *nextRoot = lvi->itemBelow(); @@ -2315,7 +2315,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) } if ( rootDecoClicked ) { - // select the thread's children after closing if the parent is selected + // select the thread's tqchildren after closing if the parent is selected if ( lvi && !lvi->isOpen() && lvi->isSelected() ) setSelected( lvi, true ); } @@ -2324,7 +2324,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) if ( lvi != currentItem() ) highlightMessage( lvi ); /* Explicitely set selection state. This is necessary because we want to - * also select all children of closed threads when the parent is selected. */ + * also select all tqchildren of closed threads when the parent is selected. */ // unless ctrl mask, set selected if it isn't already if ( !( e->state() & ControlButton ) && !wasSelected ) @@ -2344,21 +2344,21 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) HeaderItem *item = static_cast<HeaderItem*>( lvi ); KMMsgBase *msg = mFolder->getMsgBase(item->msgId()); if ( section == mPaintInfo.flagCol && flagsToggleable ) { - setMsgStatus( KMMsgStatusFlag, true ); + setMsgtqStatus( KMMsgStatusFlag, true ); } else if ( section == mPaintInfo.importantCol && flagsToggleable ) { - setMsgStatus( KMMsgStatusFlag, true ); + setMsgtqStatus( KMMsgStatusFlag, true ); } else if ( section == mPaintInfo.todoCol && flagsToggleable ) { - setMsgStatus( KMMsgStatusTodo, true ); + setMsgtqStatus( KMMsgStatusTodo, true ); } else if ( section == mPaintInfo.watchedIgnoredCol && flagsToggleable ) { if ( msg->isWatched() || msg->isIgnored() ) - setMsgStatus( KMMsgStatusIgnored, true ); + setMsgtqStatus( KMMsgStatusIgnored, true ); else - setMsgStatus( KMMsgStatusWatched, true ); + setMsgtqStatus( KMMsgStatusWatched, true ); } else if ( section == mPaintInfo.statusCol ) { if ( msg->isUnread() || msg->isNew() ) - setMsgStatus( KMMsgStatusRead ); + setMsgtqStatus( KMMsgStatusRead ); else - setMsgStatus( KMMsgStatusUnread ); + setMsgtqStatus( KMMsgStatusUnread ); } } } @@ -2424,7 +2424,7 @@ void KMHeaders::highlightMessage(TQListViewItem* i) //----------------------------------------------------------------------------- void KMHeaders::slotRMB() { - if (!topLevelWidget()) return; // safe bet + if (!tqtopLevelWidget()) return; // safe bet mOwner->updateMessageActions(); // check if the user clicked into a status column and only show the respective menues @@ -2676,7 +2676,7 @@ static void internalWriteItem(FILE *sortStream, KMFolder *folder, int msgid, TQ_INT32 len = key.length() * sizeof(TQChar); fwrite(&len, sizeof(len), 1, sortStream); if (len) - fwrite(key.unicode(), TQMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream); + fwrite(key.tqunicode(), TQMIN(len, KMAIL_MAX_KEY_LEN), 1, sortStream); if (update_discover) { //update the discovered change count @@ -2813,9 +2813,9 @@ bool KMHeaders::writeSortOrder() if (sortStream && ferror(sortStream)) { fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; - kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile )); + kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile )); } fclose(sortStream); ::rename(TQFile::encodeName(tempName), TQFile::encodeName(sortFile)); @@ -2853,9 +2853,9 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) if (sortStream && ferror(sortStream)) { fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; - kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile )); + kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on tqdevice?)").tqarg( sortFile )); } fclose(sortStream); } else { @@ -3321,7 +3321,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) qsort(unsorted, unsorted_count, sizeof(SortCacheItem *), //sort compare_SortCacheItem); - /* The sorted list now contains all sorted children of this item, while + /* The sorted list now contains all sorted tqchildren of this item, while * the (aptly named) unsorted array contains all as of yet unsorted * ones. It has just been qsorted, so it is in itself sorted. These two * sorted lists are now merged into one. */ @@ -3353,11 +3353,11 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) if(threaded && i->item()) { // If the parent is watched or ignored, propagate that to it's - // children + // tqchildren if (mFolder->getMsgBase(i->id())->isWatched()) - mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusWatched); + mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusWatched); if (mFolder->getMsgBase(i->id())->isIgnored()) - mFolder->getMsgBase(new_kci->id())->seStatus(KMMsgStatusIgnored); + mFolder->getMsgBase(new_kci->id())->setqStatus(KMMsgStatusIgnored); khi = new HeaderItem(i->item(), new_kci->id(), new_kci->key()); } else { khi = new HeaderItem(this, new_kci->id(), new_kci->key()); @@ -3499,7 +3499,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) if ( sortStream ) fclose(sortStream); unlink(TQFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; + kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on tqdevice?)" << endl; kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; return true; diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index 3dce0a664..f504c3f30 100644 --- a/kmail/kmheaders.h +++ b/kmail/kmheaders.h @@ -10,7 +10,7 @@ using KMail::HeaderItem; #include <klistview.h> #include <kfoldertree.h> // for KPaintInfo -#include <kmmsgbase.h> // for KMMsgStatus +#include <kmmsgbase.h> // for KMMsgtqStatus #include <tqwidget.h> #include <tqstrlist.h> @@ -77,13 +77,13 @@ public: /** Set all messages in the current thread to status @p status or toggle it, if specified. */ - virtual void setThreadStatus(KMMsgStatus status, bool toggle=false); + virtual void setThreadtqStatus(KMMsgtqStatus status, bool toggle=false); /* Set message status to read if it is new, or unread */ virtual void setMsgRead(int msgId); /** The following methods processes all selected messages. */ - virtual void setMsgStatus(KMMsgStatus status, bool toggle=false); + virtual void setMsgtqStatus(KMMsgtqStatus status, bool toggle=false); virtual void deleteMsg(); virtual void applyFiltersOnMsg(); virtual void undo(); @@ -286,12 +286,12 @@ public slots: virtual void ensureCurrentItemVisible(); /** Select an item and if it is the parent of a closed thread, also - recursively select its children. */ + recursively select its tqchildren. */ virtual void setSelected(TQListViewItem *item, bool selected); /** Select several items by message index * and if they are the parent of a closed thread, also - * recursively select their children. */ + * recursively select their tqchildren. */ void setSelectedByIndex(TQValueList<int> items, bool selected); /** switch a column with the given id (see KPaintInfo enum) @@ -299,7 +299,7 @@ public slots: void slotToggleColumn(int id, int mode = -1); /** Provide information about number of messages in a folder */ - void setFolderInfoStatus(); + void setFolderInfotqStatus(); protected: static TQPixmap *pixNew, *pixUns, *pixDel, *pixRead, *pixRep, *pixSent, diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 22b3c584e..e6c641300 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -732,9 +732,9 @@ int KMKernel::sendCertificate( const TQString& to, const TQByteArray& certData ) return 1; } -KMMsgStatus KMKernel::strToStatus(const TQString &flags) +KMMsgtqStatus KMKernel::strTotqStatus(const TQString &flags) { - KMMsgStatus status = 0; + KMMsgtqStatus status = 0; if (!flags.isEmpty()) { for (uint n = 0; n < flags.length() ; n++) { switch (flags[n]) { @@ -946,8 +946,8 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, } if ( !MsgStatusFlags.isEmpty() ) { - KMMsgStatus status = strToStatus(MsgStatusFlags); - if (status) msg->seStatus(status); + KMMsgtqStatus status = strTotqStatus(MsgStatusFlags); + if (status) msg->setqStatus(status); } int index; @@ -1059,8 +1059,8 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername, int index; if( !MsgStatusFlags.isEmpty() ) { - KMMsgStatus status = strToStatus(MsgStatusFlags); - if (status) msg->seStatus(status); + KMMsgtqStatus status = strTotqStatus(MsgStatusFlags); + if (status) msg->setqStatus(status); } if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) { @@ -1211,9 +1211,9 @@ TQString KMKernel::debugSernum( TQ_UINT32 serialNumber ) msg = folder->getMsgBase( idx ); if (msg) { res.append( TQString( " subject %s,\n sender %s,\n date %s.\n" ) - .arg( msg->subject() ) - .arg( msg->fromStrip() ) - .arg( msg->dateStr() ) ); + .tqarg( msg->subject() ) + .tqarg( msg->fromStrip() ) + .tqarg( msg->dateStr() ) ); } else { res.append( TQString( "Invalid serial number." ) ); } @@ -1360,7 +1360,7 @@ void KMKernel::testDir(const char *_name) KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n" "please make sure that you can view and " "modify the content of the folder '%2'.") - .arg( foldersPath ).arg( TQDir::homeDirPath() ) ); + .tqarg( foldersPath ).tqarg( TQDir::homeDirPath() ) ); ::exit(-1); } } @@ -1369,7 +1369,7 @@ void KMKernel::testDir(const char *_name) "incorrect;\n" "please make sure that you can view and modify " "the content of this folder.") - .arg( foldersPath ) ); + .tqarg( foldersPath ) ); ::exit(-1); } } @@ -1673,7 +1673,7 @@ void KMKernel::cleanupImapFolders() cfld = static_cast<KMFolderCachedImap*>(the_dimapFolderMgr->createFolder(TQString::number(acct->id()), false, KMFolderTypeCachedImap)->storage()); if (!cfld) { - KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(acct->name()).arg(the_dimapFolderMgr->basePath()))); + KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(acct->name()).tqarg(the_dimapFolderMgr->basePath()))); exit(-1); } cfld->folder()->setId( acct->id() ); @@ -1702,7 +1702,7 @@ void KMKernel::recreateCorruptIndexFiles() if ( !folder || folder->isDir() || folder->isOpened() ) continue; KMFolderIndex * const index = dynamic_cast<KMFolderIndex*>( folder->storage() ); - if ( index && index->indexStatus() != KMFolderIndex::IndexOk ) { + if ( index && index->indextqStatus() != KMFolderIndex::IndexOk ) { foldersWithBrokenIndex.append( index ); } } @@ -1884,8 +1884,8 @@ bool KMKernel::transferMail( TQString & destinationDir ) "the same name in <i>%7</i>.<p>" "<strong>Would you like %3 to move the mail " "files now?</strong></qt>" ) - .arg( kmailName, kmailName, kmailName ) - .arg( dir, destinationDir, dir, destinationDir ); + .tqarg( kmailName, kmailName, kmailName ) + .tqarg( dir, destinationDir, dir, destinationDir ); } else { msg = i18n( "%1-%3 is the application name, %4-%6 are folder path", "<qt>The <i>%4</i> folder exists. " @@ -1894,8 +1894,8 @@ bool KMKernel::transferMail( TQString & destinationDir ) "this folder for you.<p>" "<strong>Would you like %3 to move the mail " "files now?</strong></qt>" ) - .arg( kmailName, kmailName, kmailName ) - .arg( dir, destinationDir, dir ); + .tqarg( kmailName, kmailName, kmailName ) + .tqarg( dir, destinationDir, dir ); } TQString title = i18n( "Migrate Mail Files?" ); TQString buttonText = i18n( "Move" ); @@ -2047,7 +2047,7 @@ void KMKernel::slotResult(KIO::Job *job) { if (KMessageBox::warningContinueCancel(0, i18n("File %1 exists.\nDo you want to replace it?") - .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .tqarg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) byteArrayToRemoteFile((*it).data, (*it).url, true); } @@ -2135,7 +2135,7 @@ void KMKernel::emergencyExit( const TQString& reason ) mesg = i18n("KMail encountered a fatal error and will terminate now"); } else { mesg = i18n("KMail encountered a fatal error and will " - "terminate now.\nThe error was:\n%1").arg( reason ); + "terminate now.\nThe error was:\n%1").tqarg( reason ); } kdWarning() << mesg << endl; @@ -2330,13 +2330,13 @@ void KMKernel::selectFolder( TQString folderPath ) KMMainWidget *KMKernel::getKMMainWidget() { //This could definitely use a speadup - TQWidgetList *l = kapp->topLevelWidgets(); + TQWidgetList *l = kapp->tqtopLevelWidgets(); TQWidgetListIt it( *l ); TQWidget *wid; while ( ( wid = it.current() ) != 0 ) { ++it; - TQObjectList *l2 = wid->topLevelWidget()->queryList( "KMMainWidget" ); + TQObjectList *l2 = wid->tqtopLevelWidget()->queryList( "KMMainWidget" ); if (l2 && l2->first()) { KMMainWidget* kmmw = dynamic_cast<KMMainWidget *>( l2->first() ); Q_ASSERT( kmmw ); @@ -2469,7 +2469,7 @@ Wallet *KMKernel::wallet() { if ( tqApp->activeWindow() ) window = tqApp->activeWindow()->winId(); else if ( getKMMainWidget() ) - window = getKMMainWidget()->topLevelWidget()->winId(); + window = getKMMainWidget()->tqtopLevelWidget()->winId(); delete mWallet; mWallet = Wallet::openWallet( Wallet::NetworkWallet(), window ); diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index bfcd053a2..ef1688a66 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -442,7 +442,7 @@ signals: private: void openReader( bool onlyCheck ); - KMMsgStatus strToStatus(const TQString &flags); + KMMsgtqStatus strTotqStatus(const TQString &flags); KMFolder *currentFolder(); KMFolder *the_inboxFolder; diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index c078cfe7a..db2763b93 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -132,7 +132,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) KIO::NetAccess::removeTempFile( fileName ); } else { TQString caption( i18n( "vCard Import Failed" ) ); - TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).arg( (*it).url() ); + TQString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" ).tqarg( (*it).url() ); KMessageBox::error( parentWidget(), text, caption ); } } diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 13737d5b0..1dc08d053 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -14,14 +14,14 @@ #undef Unsorted // X headers... #include <tqaccel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqhbox.h> #include <tqvbox.h> #include <tqpopupmenu.h> #include <tqptrlist.h> #include <tqsignalmapper.h> #include <tqvaluevector.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <kopenwith.h> #include <kmessagebox.h> @@ -238,7 +238,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, this, TQT_SLOT(slotFolderRemoved(KMFolder*))); connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), - this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); + this, TQT_SLOT( slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ) ) ); toggleSystemTray(); @@ -246,7 +246,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, mStartupDone = true; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb ); mVacationScriptIndicator->hide(); @@ -287,13 +287,13 @@ void KMMainWidget::destruct() //----------------------------------------------------------------------------- void KMMainWidget::readPreConfig(void) { - const KConfigGroup geometry( KMKernel::config(), "Geometry" ); + const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); const KConfigGroup reader( KMKernel::config(), "Reader" ); - mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short"; - mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide"; - mReaderWindowBelow = geometry.readEntry( "readerWindowMode", "below" ) == "below"; - mThreadPref = geometry.readBoolEntry( "nestedMessages", false ); + mLongFolderList = tqgeometry.readEntry( "FolderList", "long" ) != "short"; + mReaderWindowActive = tqgeometry.readEntry( "readerWindowMode", "below" ) != "hide"; + mReaderWindowBelow = tqgeometry.readEntry( "readerWindowMode", "below" ) == "below"; + mThreadPref = tqgeometry.readBoolEntry( "nestedMessages", false ); mHtmlPref = reader.readBoolEntry( "htmlMail", false ); mHtmlLoadExtPref = reader.readBoolEntry( "htmlLoadExternal", false ); @@ -516,7 +516,7 @@ void KMMainWidget::writeConfig(void) { TQString s; KConfig *config = KMKernel::config(); - KConfigGroup geometry( config, "Geometry" ); + KConfigGroup tqgeometry( config, "Geometry" ); if (mMsgView) mMsgView->writeConfig(); @@ -527,31 +527,31 @@ void KMMainWidget::writeConfig(void) if ( mFavoriteFolderView ) mFavoriteFolderView->writeConfig(); - geometry.writeEntry( "MainWin", this->geometry().size() ); + tqgeometry.writeEntry( "MainWin", this->tqgeometry().size() ); const TQValueList<int> widths = ( mLongFolderList ? mPanner1 : mPanner2 )->sizes(); const TQValueList<int> heights = ( mLongFolderList ? mPanner2 : mPanner1 )->sizes(); - geometry.writeEntry( "FolderPaneWidth", widths[0] ); - geometry.writeEntry( "HeaderPaneWidth", widths[1] ); + tqgeometry.writeEntry( "FolderPaneWidth", widths[0] ); + tqgeometry.writeEntry( "HeaderPaneWidth", widths[1] ); // Only save when the widget is shown (to avoid saving a wrong value) if ( mSearchAndHeaders && mSearchAndHeaders->isShown() ) { - geometry.writeEntry( "HeaderPaneHeight", heights[0] ); - geometry.writeEntry( "ReaderPaneHeight", heights[1] ); + tqgeometry.writeEntry( "HeaderPaneHeight", heights[0] ); + tqgeometry.writeEntry( "ReaderPaneHeight", heights[1] ); } // save the state of the unread/total-columns - geometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() ); - geometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() ); - geometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() ); + tqgeometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() ); + tqgeometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() ); + tqgeometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() ); } //----------------------------------------------------------------------------- void KMMainWidget::createWidgets(void) { - // Create the splitters according to the layout settings + // Create the splitters according to the tqlayout settings TQWidget *headerParent = 0, *mimeParent = 0, *messageParent = 0; @@ -587,7 +587,7 @@ void KMMainWidget::createWidgets(void) mTopLayout->add( mPanner1 ); // BUG -sanders these accelerators stop working after switching - // between long/short folder layout + // between long/short folder tqlayout // Probably need to disconnect them first. // create list of messages @@ -950,7 +950,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, summary += "<br>" + i18n( "1 new message in %1", "%n new messages in %1", newInFolder.find( *it ).data() ) - .arg( folder->prettyURL() ); + .tqarg( folder->prettyURL() ); } } } @@ -965,7 +965,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if ( GlobalSettings::self()->verboseNewMailNotification() ) { summary = i18n( "%1 is a list of the number of new messages per folder", "<b>New mail arrived</b><br>%1" ) - .arg( summary ); + .tqarg( summary ); } else { summary = i18n( "New mail arrived" ); @@ -973,11 +973,11 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if(kmkernel->xmlGuiInstance()) { KNotifyClient::Instance instance(kmkernel->xmlGuiInstance()); - KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived", + KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived", summary ); } else - KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived", + KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived", summary ); if (mBeepOnNew) { @@ -1097,7 +1097,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem ) KMFolder* folder = folderItem->folder(); KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() ); KMFolderDialog props( folder, folder->parent(), folderTree, - i18n("Properties of Folder %1").arg( folder->label() ) ); + i18n("Properties of Folder %1").tqarg( folder->label() ) ); props.exec(); updateFolderMenu(); //Kolab issue 2152 @@ -1129,7 +1129,7 @@ void KMMainWidget::slotExpireFolder() KConfigGroupSaver saver(config, "General"); if (config->readBoolEntry("warn-before-expire", true)) { - str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").arg(TQStyleSheet::escape( mFolder->label() )); + str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape( mFolder->label() )); if (KMessageBox::warningContinueCancel(this, str, i18n("Expire Folder"), i18n("&Expire")) != KMessageBox::Continue) return; @@ -1152,7 +1152,7 @@ void KMMainWidget::slotEmptyFolder() TQString text = (isTrash) ? i18n("Are you sure you want to empty the trash folder?") : i18n("<qt>Are you sure you want to move all messages from " - "folder <b>%1</b> to the trash?</qt>").arg( TQStyleSheet::escape( mFolder->label() ) ); + "folder <b>%1</b> to the trash?</qt>").tqarg( TQStyleSheet::escape( mFolder->label() ) ); if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem( title, "edittrash")) != KMessageBox::Continue) return; @@ -1209,14 +1209,14 @@ void KMMainWidget::slotRemoveFolder() title = i18n("Delete Search"); str = i18n("<qt>Are you sure you want to delete the search <b>%1</b>?<br>" "Any messages it shows will still be available in their original folder.</qt>") - .arg( TQStyleSheet::escape( mFolder->label() ) ); + .tqarg( TQStyleSheet::escape( mFolder->label() ) ); } else { title = i18n("Delete Folder"); if ( mFolder->count() == 0 ) { if ( !mFolder->child() || mFolder->child()->isEmpty() ) { str = i18n("<qt>Are you sure you want to delete the empty folder " "<b>%1</b>?</qt>") - .arg( TQStyleSheet::escape( mFolder->label() ) ); + .tqarg( TQStyleSheet::escape( mFolder->label() ) ); } else { str = i18n("<qt>Are you sure you want to delete the empty folder " @@ -1224,7 +1224,7 @@ void KMMainWidget::slotRemoveFolder() "not be empty and their contents will be discarded as well. " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .arg( TQStyleSheet::escape( mFolder->label() ) ); + .tqarg( TQStyleSheet::escape( mFolder->label() ) ); } } else { if ( !mFolder->child() || mFolder->child()->isEmpty() ) { @@ -1232,14 +1232,14 @@ void KMMainWidget::slotRemoveFolder() "<b>%1</b>, discarding its contents? " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .arg( TQStyleSheet::escape( mFolder->label() ) ); + .tqarg( TQStyleSheet::escape( mFolder->label() ) ); } else { str = i18n("<qt>Are you sure you want to delete the folder <b>%1</b> " "and all its subfolders, discarding their contents? " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .arg( TQStyleSheet::escape( mFolder->label() ) ); + .tqarg( TQStyleSheet::escape( mFolder->label() ) ); } } } @@ -1636,7 +1636,7 @@ void KMMainWidget::updateListFilterAction() mListFilterAction->setEnabled( false ); else { mListFilterAction->setEnabled( true ); - mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).arg( lname ) ); + mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).tqarg( lname ) ); } } @@ -1713,12 +1713,12 @@ void KMMainWidget::slotApplyFilters() //----------------------------------------------------------------------------- void KMMainWidget::slotCheckVacation() { - updateVactionScripStatus( false ); + updateVactionScriptqStatus( false ); if ( !kmkernel->askToGoOnline() ) return; Vacation *vac = new Vacation( TQT_TQOBJECT(this), true /* check only */ ); - connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); + connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) ); } void KMMainWidget::slotEditVacation() @@ -1731,7 +1731,7 @@ void KMMainWidget::slotEditVacation() return; mVacation = new Vacation( TQT_TQOBJECT(this) ); - connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); + connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) ); if ( mVacation->isUsable() ) { connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) ); } else { @@ -1903,10 +1903,10 @@ void KMMainWidget::slotSaveAttachments() saveCommand->start(); } -void KMMainWidget::slotOnlineStatus() +void KMMainWidget::slotOnlinetqStatus() { // KMKernel will emit a signal when we toggle the network state that is caught by - // KMMainWidget::slotUpdateOnlineStatus to update our GUI + // KMMainWidget::slotUpdateOnlinetqStatus to update our GUI if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) { // if online; then toggle and set it offline. kmkernel->stopNetworkJobs(); @@ -1916,7 +1916,7 @@ void KMMainWidget::slotOnlineStatus() } } -void KMMainWidget::slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) +void KMMainWidget::slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ) { if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) actionCollection()->action( "online_status" )->setText( i18n("Work Offline") ); @@ -2239,37 +2239,37 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion() //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusNew() { - mHeaders->setThreadStatus(KMMsgStatusNew); + mHeaders->setThreadtqStatus(KMMsgStatusNew); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusUnread() { - mHeaders->setThreadStatus(KMMsgStatusUnread); + mHeaders->setThreadtqStatus(KMMsgStatusUnread); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusFlag() { - mHeaders->setThreadStatus(KMMsgStatusFlag, true); + mHeaders->setThreadtqStatus(KMMsgStatusFlag, true); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusRead() { - mHeaders->setThreadStatus(KMMsgStatusRead); + mHeaders->setThreadtqStatus(KMMsgStatusRead); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusTodo() { - mHeaders->setThreadStatus(KMMsgStatusTodo, true); + mHeaders->setThreadtqStatus(KMMsgStatusTodo, true); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusWatched() { - mHeaders->setThreadStatus(KMMsgStatusWatched, true); + mHeaders->setThreadtqStatus(KMMsgStatusWatched, true); if (mWatchThreadAction->isChecked()) { mIgnoreThreadAction->setChecked(false); } @@ -2278,7 +2278,7 @@ void KMMainWidget::slotSetThreadStatusWatched() //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusIgnored() { - mHeaders->setThreadStatus(KMMsgStatusIgnored, true); + mHeaders->setThreadtqStatus(KMMsgStatusIgnored, true); if (mIgnoreThreadAction->isChecked()) { mWatchThreadAction->setChecked(false); } @@ -2690,7 +2690,7 @@ void KMMainWidget::setupActions() TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); + TQT_SLOT(slotOnlinetqStatus()), actionCollection(), "online_status"); KActionMenu *sendActionMenu = new KActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(), @@ -3402,7 +3402,7 @@ void KMMainWidget::updateMessageActions() actionCollection()->action( "go_prev_unread_message" )->setEnabled( enable_goto_unread ); actionCollection()->action( "send_queued" )->setEnabled( kmkernel->outboxFolder()->count() > 0 ); actionCollection()->action( "send_queued_via" )->setEnabled( kmkernel->outboxFolder()->count() > 0 ); - slotUpdateOnlineStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) ); + slotUpdateOnlinetqStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) ); if (action( "edit_undo" )) action( "edit_undo" )->setEnabled( mHeaders->canUndo() ); @@ -3514,8 +3514,8 @@ void KMMainWidget::slotMemInfo() { "Memory allocated, not used: %3\n" "Memory total allocated : %4\n" "Max. freeable memory : %5\n") - .arg(mi.hblks).arg(fmt(mi.uordblks)).arg(fmt(mi.fordblks)) - .arg(fmt(mi.arena)).arg(fmt(mi.keepcost)); + .tqarg(mi.hblks).tqarg(fmt(mi.uordblks)).tqarg(fmt(mi.fordblks)) + .tqarg(fmt(mi.arena)).tqarg(fmt(mi.keepcost)); KMessageBox::information(0, s, "Malloc information", s); #endif } @@ -3712,13 +3712,13 @@ void KMMainWidget::initializeFilterActions() TQValueListConstIterator<KMFilter*> it = kmkernel->filterMgr()->filters().constBegin(); for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) { if (!(*it)->isEmpty() && (*it)->configureShortcut()) { - filterName = TQString("Filter %1").arg((*it)->name()); + filterName = TQString("Filter %1").tqarg((*it)->name()); normalizedName = filterName.replace(" ", "_"); if (action(normalizedName.utf8())) continue; filterCommand = new KMMetaFilterActionCommand(*it, mHeaders, this); mFilterCommands.append(filterCommand); - TQString as = i18n("Filter %1").arg((*it)->name()); + TQString as = i18n("Filter %1").tqarg((*it)->name()); TQString icon = (*it)->icon(); if ( icon.isEmpty() ) icon = "gear"; @@ -3801,8 +3801,8 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder ) FolderShortcutCommand *c = new FolderShortcutCommand( this, folder ); mFolderShortcutCommands.insert( folder->idString(), c ); - TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() ); - TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() ); + TQString actionlabel = TQString( "FolderShortcut %1").tqarg( folder->prettyURL() ); + TQString actionname = TQString( "FolderShortcut %1").tqarg( folder->idString() ); TQString normalizedName = actionname.replace(" ", "_"); KAction* action = new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()), @@ -3993,14 +3993,14 @@ void KMMainWidget::slotRequestFullSearchFromQuickSearch() assert( mSearchWin ); KMSearchPattern pattern; pattern.append( KMSearchRule::createInstance( "<message>", KMSearchRule::FuncContains, mQuickSearchLine->currentSearchTerm() ) ); - int status = mQuickSearchLine->currenStatus(); + int status = mQuickSearchLine->currentqStatus(); if ( status != 0 ) { - pattern.append( new KMSearchRuleStatus( status ) ); + pattern.append( new KMSearchRuletqStatus( status ) ); } mSearchWin->setSearchPattern( pattern ); } -void KMMainWidget::updateVactionScripStatus(bool active) +void KMMainWidget::updateVactionScriptqStatus(bool active) { mVacationIndicatorActive = active; if ( active ) { diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index e67f4fbd7..26e5eee3f 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -179,7 +179,7 @@ public: void setupForwardingActionsList(); KStatusBarLabel* vacationScriptIndicator() const { return mVacationScriptIndicator; } - void updateVactionScripStatus() { updateVactionScripStatus( mVacationIndicatorActive ); } + void updateVactionScriptqStatus() { updateVactionScriptqStatus( mVacationIndicatorActive ); } public slots: void slotMoveMsgToFolder( KMFolder *dest); @@ -339,8 +339,8 @@ protected slots: void slotToggleSizeColumn(); void slotSendQueued(); void slotSendQueuedVia( int item ); - void slotOnlineStatus(); - void slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ); + void slotOnlinetqStatus(); + void slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ); void slotMsgPopup(KMMessage &msg, const KURL &aUrl, const TQPoint&); void slotMarkAll(); void slotMemInfo(); @@ -447,7 +447,7 @@ private: private slots: void slotRequestFullSearchFromQuickSearch(); - void updateVactionScripStatus( bool active ); + void updateVactionScriptqStatus( bool active ); private: // Message actions diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index aeb4beb46..1e666701d 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -44,7 +44,7 @@ using KMail::HeaderStrategy; #include <kasciistricmp.h> #include <tqcursor.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqmessagebox.h> #include <kmime_util.h> #include <kmime_charfreq.h> @@ -110,7 +110,7 @@ KMMessage::KMMessage(KMMsgInfo& msgInfo): KMMsgBase() // now overwrite a few from the msgInfo mMsgSize = msgInfo.msgSize(); mFolderOffset = msgInfo.folderOffset(); - mStatus = msgInfo.status(); + mtqStatus = msgInfo.status(); mEncryptionState = msgInfo.encryptionState(); mSignatureState = msgInfo.signatureState(); mMDNSentState = msgInfo.mdnSentState(); @@ -145,7 +145,7 @@ void KMMessage::init( DwMessage* aMsg ) mMsgSize = 0; mMsgLength = 0; mFolderOffset = 0; - mStatus = KMMsgStatusNew; + mtqStatus = KMMsgStatusNew; mEncryptionState = KMMsgEncryptionStateUnknown; mSignatureState = KMMsgSignatureStateUnknown; mMDNSentState = KMMsgMDNStateUnknown; @@ -173,7 +173,7 @@ void KMMessage::assign( const KMMessage& other ) mMsgSize = other.mMsgSize; mMsgLength = other.mMsgLength; mFolderOffset = other.mFolderOffset; - mStatus = other.mStatus; + mtqStatus = other.mtqStatus; mEncryptionState = other.mEncryptionState; mSignatureState = other.mSignatureState; mMDNSentState = other.mMDNSentState; @@ -384,7 +384,7 @@ TQString KMMessage::headerAsString() const header.Assemble(); if ( header.AsString().empty() ) return TQString(); - return TQString::fromLatin1( header.AsString().c_str() ); + return TQString::tqfromLatin1( header.AsString().c_str() ); } @@ -394,26 +394,26 @@ DwMediaType& KMMessage::dwContentType() return mMsg->Headers().ContentType(); } -void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) { - return fromDwString( DwString( ba.data(), ba.size() ), seStatus ); +void KMMessage::fromByteArray( const TQByteArray & ba, bool setqStatus ) { + return fromDwString( DwString( ba.data(), ba.size() ), setqStatus ); } -void KMMessage::fromString( const TQCString & str, bool aSeStatus ) { - return fromDwString( KMail::Util::dwString( str ), aSeStatus ); +void KMMessage::fromString( const TQCString & str, bool aSetqStatus ) { + return fromDwString( KMail::Util::dwString( str ), aSetqStatus ); } -void KMMessage::fromDwString(const DwString& str, bool aSeStatus) +void KMMessage::fromDwString(const DwString& str, bool aSetqStatus) { delete mMsg; mMsg = new DwMessage; mMsg->FromString( str ); mMsg->Parse(); - if (aSeStatus) { - seStatus(headerField("Status").latin1(), headerField("X-Status").latin1()); + if (aSetqStatus) { + setqStatus(headerField("Status").latin1(), headerField("X-Status").latin1()); setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) ); setSignatureStateChar( headerField("X-KMail-SignatureState").at(0) ); - setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").at(0).latin1() ) ); + setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").tqat(0).latin1() ) ); } if ( invitationState() == KMMsgInvitationUnknown && readyToShow() ) updateInvitationState(); @@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, parser.process( this ); } } - // seStatus(KMMsgStatusReplied); + // setqStatus(KMMsgStatusReplied); msg->link(this, KMMsgStatusReplied); if ( parent() && parent()->putRepliesInSameFolder() ) @@ -1141,14 +1141,14 @@ KMMessage* KMMessage::createRedirect( const TQString &toStr ) // X-KMail-Redirect-From: content TQString strByWayOf = TQString("%1 (by way of %2 <%3>)") - .arg( from() ) - .arg( ident.fullName() ) - .arg( ident.primaryEmailAddress() ); + .tqarg( from() ) + .tqarg( ident.fullName() ) + .tqarg( ident.primaryEmailAddress() ); // Resent-From: content TQString strFrom = TQString("%1 <%2>") - .arg( ident.fullName() ) - .arg( ident.primaryEmailAddress() ); + .tqarg( ident.fullName() ) + .tqarg( ident.primaryEmailAddress() ); // format the current date to be used in Resent-Date: TQString origDate = msg->headerField( "Date" ); @@ -1216,7 +1216,7 @@ void KMMessage::sanitizeHeaders( const TQStringList& whiteList ) { nextField = field->Next(); if ( field->FieldNameStr().find( "ontent" ) == DwString::npos - && !whiteList.contains( TQString::fromLatin1( field->FieldNameStr().c_str() ) ) ) + && !whiteList.contains( TQString::tqfromLatin1( field->FieldNameStr().c_str() ) ) ) header.RemoveField(field); field = nextField; } @@ -3160,7 +3160,7 @@ void KMMessage::bodyPart(int aIdx, KMMessagePart* aPart) const if ( DwBodyPart *part = dwBodyPart( aIdx ) ) { KMMessage::bodyPart(part, aPart); if( aPart->name().isEmpty() ) - aPart->setName( i18n("Attachment: %1").arg( aIdx ) ); + aPart->setName( i18n("Attachment: %1").tqarg( aIdx ) ); } } @@ -3193,7 +3193,7 @@ bool KMMessage::deleteBodyPart( int partIndex ) dummyPart.duplicate( part ); TQString comment = i18n("This attachment has been deleted."); if ( !part.fileName().isEmpty() ) - comment = i18n( "The attachment '%1' has been deleted." ).arg( part.fileName() ); + comment = i18n( "The attachment '%1' has been deleted." ).tqarg( part.fileName() ); dummyPart.setContentDescription( comment ); dummyPart.setBodyEncodedBinary( TQByteArray() ); TQCString cd = dummyPart.contentDisposition(); @@ -3358,7 +3358,7 @@ void KMMessage::addBodyPart(const KMMessagePart* aPart) //----------------------------------------------------------------------------- TQString KMMessage::generateMessageId( const TQString& addr ) { - TQDateTime datetime = TQDateTime::currentDateTime(); + TQDateTime datetime = TQDateTime::tqcurrentDateTime(); TQString msgIdStr; msgIdStr = '<' + datetime.toString( "yyyyMMddhhmm.sszzz" ); @@ -3457,7 +3457,7 @@ TQCString KMMessage::html2source( const TQCString & src ) TQString KMMessage::encodeMailtoUrl( const TQString& str ) { TQString result; - result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str, + result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str, "utf-8" ) ); result = KURL::encode_string( result ); return result; @@ -4037,7 +4037,7 @@ void KMMessage::readConfig() int languageNr = config->readNumEntry("reply-current-language",0); { // area for config group "KMMessage #n" - KConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr)); + KConfigGroupSaver saver(config, TQString("KMMessage #%1").tqarg(languageNr)); sReplyLanguage = config->readEntry("language",KGlobal::locale()->language()); sReplyStr = config->readEntry("phrase-reply", i18n("On %D, you wrote:")); @@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity ) //----------------------------------------------------------------------------- -void KMMessage::seStatus(const KMMsgStatus aStatus, int idx) +void KMMessage::setqStatus(const KMMsgtqStatus atqStatus, int idx) { - if (mStatus == aStatus) + if (mtqStatus == atqStatus) return; - KMMsgBase::seStatus(aStatus, idx); + KMMsgBase::setqStatus(atqStatus, idx); } void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx) @@ -4182,11 +4182,11 @@ void KMMessage::setMDNSentState( KMMsgMDNSentState status, int idx ) } //----------------------------------------------------------------------------- -void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus ) +void KMMessage::link( const KMMessage *aMsg, KMMsgtqStatus atqStatus ) { - Q_ASSERT( aStatus == KMMsgStatusReplied - || aStatus == KMMsgStatusForwarded - || aStatus == KMMsgStatusDeleted ); + Q_ASSERT( atqStatus == KMMsgStatusReplied + || atqStatus == KMMsgStatusForwarded + || atqStatus == KMMsgStatusDeleted ); TQString message = headerField( "X-KMail-Link-Message" ); if ( !message.isEmpty() ) @@ -4196,11 +4196,11 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus ) type += ','; message += TQString::number( aMsg->getMsgSerNum() ); - if ( aStatus == KMMsgStatusReplied ) + if ( atqStatus == KMMsgStatusReplied ) type += "reply"; - else if ( aStatus == KMMsgStatusForwarded ) + else if ( atqStatus == KMMsgStatusForwarded ) type += "forward"; - else if ( aStatus == KMMsgStatusDeleted ) + else if ( atqStatus == KMMsgStatusDeleted ) type += "deleted"; setHeaderField( "X-KMail-Link-Message", message ); @@ -4208,10 +4208,10 @@ void KMMessage::link( const KMMessage *aMsg, KMMsgStatus aStatus ) } //----------------------------------------------------------------------------- -void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const +void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const { *retMsgSerNum = 0; - *reStatus = KMMsgStatusUnknown; + *retqStatus = KMMsgStatusUnknown; TQString message = headerField("X-KMail-Link-Message"); TQString type = headerField("X-KMail-Link-Type"); @@ -4221,11 +4221,11 @@ void KMMessage::getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const if ( !message.isEmpty() && !type.isEmpty() ) { *retMsgSerNum = message.toULong(); if ( type == "reply" ) - *reStatus = KMMsgStatusReplied; + *retqStatus = KMMsgStatusReplied; else if ( type == "forward" ) - *reStatus = KMMsgStatusForwarded; + *retqStatus = KMMsgStatusForwarded; else if ( type == "deleted" ) - *reStatus = KMMsgStatusDeleted; + *retqStatus = KMMsgStatusDeleted; } } @@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState() cntType += '/'; cntType += mMsg->Headers().ContentType().SubtypeStr().c_str(); if ( cntType.lower() == "text/calendar" ) { - seStatus( KMMsgStatusHasInvitation ); + setqStatus( KMMsgStatusHasInvitation ); return; } } - seStatus( KMMsgStatusHasNoInvitation ); + setqStatus( KMMsgStatusHasNoInvitation ); return; } @@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) if ( !part ) { // kdDebug(5006) << "updateAttachmentState - no part!" << endl; - seStatus( KMMsgStatusHasNoAttach ); + setqStatus( KMMsgStatusHasNoAttach ); return; } @@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature && part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) ) { - seStatus( KMMsgStatusHasAttach ); + setqStatus( KMMsgStatusHasAttach ); } return; } @@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) if ( part->Next() ) updateAttachmentState( part->Next() ); else if ( attachmentState() == KMMsgAttachmentUnknown ) - seStatus( KMMsgStatusHasNoAttach ); + setqStatus( KMMsgStatusHasNoAttach ); } void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity ) diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index 9acaa7f1d..ebc8c78ef 100644 --- a/kmail/kmmessage.h +++ b/kmail/kmmessage.h @@ -150,13 +150,13 @@ public: } /** Mark the message as deleted */ - void del() { seStatus(KMMsgStatusDeleted); } + void del() { setqStatus(KMMsgStatusDeleted); } /** Undelete the message. Same as touch */ - void undel() { seStatus(KMMsgStatusOld); } + void undel() { setqStatus(KMMsgStatusOld); } /** Touch the message - mark it as read */ - void touch() { seStatus(KMMsgStatusOld); } + void touch() { setqStatus(KMMsgStatusOld); } /** Create a new message that is a reply to this message, filling all required header fields with the proper values. The returned message @@ -210,9 +210,9 @@ public: void sanitizeHeaders( const TQStringList& whiteList = TQStringList() ); /** Parse the string and create this message from it. */ - void fromDwString(const DwString& str, bool seStatus=false); - void fromString(const TQCString& str, bool seStatus=false); - void fromByteArray(const TQByteArray & ba, bool seStatus=false); + void fromDwString(const DwString& str, bool setqStatus=false); + void fromString(const TQCString& str, bool setqStatus=false); + void fromByteArray(const TQByteArray & ba, bool setqStatus=false); /** Return the entire message contents in the DwString. This function is *fast* even for large message since it does *not* involve a @@ -243,7 +243,7 @@ public: TQCString headerAsSendableString() const; /** - * Remove all private header fields: *Status: and X-KMail-* + * Remove all private header fields: *tqStatus: and X-KMail-* **/ void removePrivateHeaderFields(); @@ -545,7 +545,7 @@ public: */ void setBodyFromUnicode( const TQString & str, DwEntity *entity = 0 ); - /** Returns the body part decoded to unicode. + /** Returns the body part decoded to tqunicode. **/ TQString bodyToUnicode(const TQTextCodec* codec=0) const; @@ -746,7 +746,7 @@ public: static TQString guessEmailAddressFromLoginName( const TQString& userName ); /** - * Given argument msg add quoting characters and relayout for max width maxLength + * Given argument msg add quoting characters and retqlayout for max width maxLength * @param msg the string which it to be quoted * @param maxLineLength reformat text to be this amount of columns at maximum, adding * linefeeds at word boundaries to make it fit. @@ -822,11 +822,11 @@ public: ulong UID() const; void setUID(ulong uid); - /** Status of the message. */ - KMMsgStatus status() const { return mStatus; } + /** tqStatus of the message. */ + KMMsgtqStatus status() const { return mtqStatus; } /** Set status and mark dirty. */ - void seStatus(const KMMsgStatus status, int idx = -1); - void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); } + void setqStatus(const KMMsgtqStatus status, int idx = -1); + void setqStatus(const char* s1, const char* s2=0) { KMMsgBase::setqStatus(s1, s2); } /** Set encryption status of the message. */ void setEncryptionState(const KMMsgEncryptionState, int idx = -1); @@ -844,11 +844,11 @@ public: KMMsgMDNSentState mdnSentState() const { return mMDNSentState; } - /** Links this message to @p aMsg, setting link type to @p aStatus. */ - void link(const KMMessage *aMsg, KMMsgStatus aStatus); + /** Links this message to @p aMsg, setting link type to @p atqStatus. */ + void link(const KMMessage *aMsg, KMMsgtqStatus atqStatus); /** Returns the information for the Nth link into @p retMsg - * and @p reStatus. */ - void getLink(int n, ulong *retMsgSerNum, KMMsgStatus *reStatus) const; + * and @p retqStatus. */ + void getLink(int n, ulong *retMsgSerNum, KMMsgtqStatus *retqStatus) const; /** Convert wildcards into normal string */ TQString formatString(const TQString&) const; diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 299a7c70f..cd05ee38c 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -46,7 +46,7 @@ #include <kmessagebox.h> #include <kiconloader.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqheader.h> #include <tqpopupmenu.h> #include <tqstyle.h> @@ -95,7 +95,7 @@ void KMMimePartTree::restoreLayoutIfPresent() { header()->setStretchEnabled( true, 0 ); // rest of the columns: if ( KMKernel::config()->hasGroup( configGroup ) ) { - // there is a saved layout. use it... + // there is a saved tqlayout. use it... restoreLayout( KMKernel::config(), configGroup ); // and disable Maximum mode: for ( int i = 1 ; i < 4 ; ++i ) @@ -214,9 +214,9 @@ void KMMimePartTree::setStyleDependantFrameWidth() // set the width of the frame to a reasonable value for the current GUI style int frameWidth; if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != lineWidth() ) @@ -309,7 +309,7 @@ void KMMimePartTree::slotCopy() if ( !url.isValid() ) return; urls.append( url ); KURLDrag* drag = new KURLDrag( urls, this ); - TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); + TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); } //============================================================================= diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp index 05a128411..f1341d6c8 100644 --- a/kmail/kmmsgbase.cpp +++ b/kmail/kmmsgbase.cpp @@ -22,7 +22,7 @@ using KMail::MessageProperty; #include <mimelib/mimepp.h> #include <kmime_codecs.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqdeepcopy.h> #include <tqregexp.h> @@ -72,7 +72,7 @@ using KMail::MessageProperty; //----------------------------------------------------------------------------- KMMsgBase::KMMsgBase(KMFolder* aParentFolder) : mParent( aParentFolder ), mIndexOffset( 0 ), - mIndexLength( 0 ), mDirty( false ), mEnableUndo( false ), mStatus( KMMsgStatusUnknown ) + mIndexLength( 0 ), mDirty( false ), mEnableUndo( false ), mtqStatus( KMMsgStatusUnknown ) { } @@ -121,145 +121,145 @@ bool KMMsgBase::isMessage(void) const return false; } //----------------------------------------------------------------------------- -void KMMsgBase::toggleStatus(const KMMsgStatus aStatus, int idx) +void KMMsgBase::toggletqStatus(const KMMsgtqStatus atqStatus, int idx) { mDirty = true; - KMMsgStatus oldStatus = status(); - if ( status() & aStatus ) { - mStatus &= ~aStatus; + KMMsgtqStatus oldtqStatus = status(); + if ( status() & atqStatus ) { + mtqStatus &= ~atqStatus; } else { - mStatus |= aStatus; + mtqStatus |= atqStatus; // Ignored and Watched are toggleable, yet mutually exclusive. // That is an arbitrary restriction on my part. HAR HAR HAR :) -till - if (aStatus == KMMsgStatusWatched) - mStatus &= ~KMMsgStatusIgnored; - if (aStatus == KMMsgStatusIgnored) - mStatus &= ~KMMsgStatusWatched; - if (aStatus == KMMsgStatusSpam) - mStatus &= ~KMMsgStatusHam; - if (aStatus == KMMsgStatusHam) - mStatus &= ~KMMsgStatusSpam; + if (atqStatus == KMMsgStatusWatched) + mtqStatus &= ~KMMsgStatusIgnored; + if (atqStatus == KMMsgStatusIgnored) + mtqStatus &= ~KMMsgStatusWatched; + if (atqStatus == KMMsgStatusSpam) + mtqStatus &= ~KMMsgStatusHam; + if (atqStatus == KMMsgStatusHam) + mtqStatus &= ~KMMsgStatusSpam; } if (storage()) { if (idx < 0) idx = storage()->find( this ); - storage()->msgStatusChanged( oldStatus, status(), idx ); + storage()->msgStatusChanged( oldtqStatus, status(), idx ); storage()->headerOfMsgChanged(this, idx); } } //----------------------------------------------------------------------------- -void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx) +void KMMsgBase::setqStatus(const KMMsgtqStatus atqStatus, int idx) { mDirty = true; - KMMsgStatus oldStatus = status(); - switch (aStatus) { + KMMsgtqStatus oldtqStatus = status(); + switch (atqStatus) { case KMMsgStatusRead: // Unset unread and new, set read - mStatus &= ~KMMsgStatusUnread; - mStatus &= ~KMMsgStatusNew; - mStatus |= KMMsgStatusRead; + mtqStatus &= ~KMMsgStatusUnread; + mtqStatus &= ~KMMsgStatusNew; + mtqStatus |= KMMsgStatusRead; break; case KMMsgStatusUnread: // unread overrides read - mStatus &= ~KMMsgStatusOld; - mStatus &= ~KMMsgStatusRead; - mStatus &= ~KMMsgStatusNew; - mStatus |= KMMsgStatusUnread; + mtqStatus &= ~KMMsgStatusOld; + mtqStatus &= ~KMMsgStatusRead; + mtqStatus &= ~KMMsgStatusNew; + mtqStatus |= KMMsgStatusUnread; break; case KMMsgStatusOld: // old can't be new or unread - mStatus &= ~KMMsgStatusNew; - mStatus &= ~KMMsgStatusUnread; - mStatus |= KMMsgStatusOld; + mtqStatus &= ~KMMsgStatusNew; + mtqStatus &= ~KMMsgStatusUnread; + mtqStatus |= KMMsgStatusOld; break; case KMMsgStatusNew: // new overrides old and read - mStatus &= ~KMMsgStatusOld; - mStatus &= ~KMMsgStatusRead; - mStatus &= ~KMMsgStatusUnread; - mStatus |= KMMsgStatusNew; + mtqStatus &= ~KMMsgStatusOld; + mtqStatus &= ~KMMsgStatusRead; + mtqStatus &= ~KMMsgStatusUnread; + mtqStatus |= KMMsgStatusNew; break; case KMMsgStatusDeleted: - mStatus |= KMMsgStatusDeleted; + mtqStatus |= KMMsgStatusDeleted; break; case KMMsgStatusReplied: - mStatus |= KMMsgStatusReplied; + mtqStatus |= KMMsgStatusReplied; break; case KMMsgStatusForwarded: - mStatus |= KMMsgStatusForwarded; + mtqStatus |= KMMsgStatusForwarded; break; case KMMsgStatusQueued: - mStatus |= KMMsgStatusQueued; + mtqStatus |= KMMsgStatusQueued; break; case KMMsgStatusTodo: - mStatus |= KMMsgStatusTodo; + mtqStatus |= KMMsgStatusTodo; break; case KMMsgStatusSent: - mStatus &= ~KMMsgStatusQueued; - mStatus &= ~KMMsgStatusUnread; - mStatus &= ~KMMsgStatusNew; - mStatus |= KMMsgStatusSent; + mtqStatus &= ~KMMsgStatusQueued; + mtqStatus &= ~KMMsgStatusUnread; + mtqStatus &= ~KMMsgStatusNew; + mtqStatus |= KMMsgStatusSent; break; case KMMsgStatusFlag: - mStatus |= KMMsgStatusFlag; + mtqStatus |= KMMsgStatusFlag; break; // Watched and ignored are mutually exclusive case KMMsgStatusWatched: - mStatus &= ~KMMsgStatusIgnored; - mStatus |= KMMsgStatusWatched; + mtqStatus &= ~KMMsgStatusIgnored; + mtqStatus |= KMMsgStatusWatched; break; case KMMsgStatusIgnored: - mStatus &= ~KMMsgStatusWatched; - mStatus |= KMMsgStatusIgnored; + mtqStatus &= ~KMMsgStatusWatched; + mtqStatus |= KMMsgStatusIgnored; break; // as are ham and spam case KMMsgStatusSpam: - mStatus &= ~KMMsgStatusHam; - mStatus |= KMMsgStatusSpam; + mtqStatus &= ~KMMsgStatusHam; + mtqStatus |= KMMsgStatusSpam; break; case KMMsgStatusHam: - mStatus &= ~KMMsgStatusSpam; - mStatus |= KMMsgStatusHam; + mtqStatus &= ~KMMsgStatusSpam; + mtqStatus |= KMMsgStatusHam; break; case KMMsgStatusHasAttach: - mStatus &= ~KMMsgStatusHasNoAttach; - mStatus |= KMMsgStatusHasAttach; + mtqStatus &= ~KMMsgStatusHasNoAttach; + mtqStatus |= KMMsgStatusHasAttach; break; case KMMsgStatusHasNoAttach: - mStatus &= ~KMMsgStatusHasAttach; - mStatus |= KMMsgStatusHasNoAttach; + mtqStatus &= ~KMMsgStatusHasAttach; + mtqStatus |= KMMsgStatusHasNoAttach; break; case KMMsgStatusHasInvitation: - mStatus &= ~KMMsgStatusHasNoInvitation; - mStatus |= KMMsgStatusHasInvitation; + mtqStatus &= ~KMMsgStatusHasNoInvitation; + mtqStatus |= KMMsgStatusHasInvitation; break; case KMMsgStatusHasNoInvitation: - mStatus &= ~KMMsgStatusHasInvitation; - mStatus |= KMMsgStatusHasNoInvitation; + mtqStatus &= ~KMMsgStatusHasInvitation; + mtqStatus |= KMMsgStatusHasNoInvitation; break; default: - mStatus = aStatus; + mtqStatus = atqStatus; break; } - if ( oldStatus != mStatus && storage() ) { + if ( oldtqStatus != mtqStatus && storage() ) { if (idx < 0) idx = storage()->find( this ); - storage()->msgStatusChanged( oldStatus, status(), idx ); + storage()->msgStatusChanged( oldtqStatus, status(), idx ); storage()->headerOfMsgChanged( this, idx ); } } @@ -267,40 +267,40 @@ void KMMsgBase::seStatus(const KMMsgStatus aStatus, int idx) //----------------------------------------------------------------------------- -void KMMsgBase::seStatus(const char* aStatusStr, const char* aXStatusStr) +void KMMsgBase::setqStatus(const char* aStatusStr, const char* aXStatusStr) { // first try to find status from "X-Status" field if given if (aXStatusStr) { - if (strchr(aXStatusStr, 'N')) seStatus(KMMsgStatusNew); - if (strchr(aXStatusStr, 'U')) seStatus(KMMsgStatusUnread); - if (strchr(aXStatusStr, 'O')) seStatus(KMMsgStatusOld); - if (strchr(aXStatusStr, 'R')) seStatus(KMMsgStatusRead); - if (strchr(aXStatusStr, 'D')) seStatus(KMMsgStatusDeleted); - if (strchr(aXStatusStr, 'A')) seStatus(KMMsgStatusReplied); - if (strchr(aXStatusStr, 'F')) seStatus(KMMsgStatusForwarded); - if (strchr(aXStatusStr, 'Q')) seStatus(KMMsgStatusQueued); - if (strchr(aXStatusStr, 'K')) seStatus(KMMsgStatusTodo); - if (strchr(aXStatusStr, 'S')) seStatus(KMMsgStatusSent); - if (strchr(aXStatusStr, 'G')) seStatus(KMMsgStatusFlag); - if (strchr(aXStatusStr, 'P')) seStatus(KMMsgStatusSpam); - if (strchr(aXStatusStr, 'H')) seStatus(KMMsgStatusHam); - if (strchr(aXStatusStr, 'T')) seStatus(KMMsgStatusHasAttach); - if (strchr(aXStatusStr, 'C')) seStatus(KMMsgStatusHasNoAttach); + if (strchr(aXStatusStr, 'N')) setqStatus(KMMsgStatusNew); + if (strchr(aXStatusStr, 'U')) setqStatus(KMMsgStatusUnread); + if (strchr(aXStatusStr, 'O')) setqStatus(KMMsgStatusOld); + if (strchr(aXStatusStr, 'R')) setqStatus(KMMsgStatusRead); + if (strchr(aXStatusStr, 'D')) setqStatus(KMMsgStatusDeleted); + if (strchr(aXStatusStr, 'A')) setqStatus(KMMsgStatusReplied); + if (strchr(aXStatusStr, 'F')) setqStatus(KMMsgStatusForwarded); + if (strchr(aXStatusStr, 'Q')) setqStatus(KMMsgStatusQueued); + if (strchr(aXStatusStr, 'K')) setqStatus(KMMsgStatusTodo); + if (strchr(aXStatusStr, 'S')) setqStatus(KMMsgStatusSent); + if (strchr(aXStatusStr, 'G')) setqStatus(KMMsgStatusFlag); + if (strchr(aXStatusStr, 'P')) setqStatus(KMMsgStatusSpam); + if (strchr(aXStatusStr, 'H')) setqStatus(KMMsgStatusHam); + if (strchr(aXStatusStr, 'T')) setqStatus(KMMsgStatusHasAttach); + if (strchr(aXStatusStr, 'C')) setqStatus(KMMsgStatusHasNoAttach); } // Merge the contents of the "Status" field if (aStatusStr) { if ((aStatusStr[0]== 'R' && aStatusStr[1]== 'O') || (aStatusStr[0]== 'O' && aStatusStr[1]== 'R')) { - seStatus( KMMsgStatusOld ); - seStatus( KMMsgStatusRead ); + setqStatus( KMMsgStatusOld ); + setqStatus( KMMsgStatusRead ); } else if (aStatusStr[0] == 'R') - seStatus(KMMsgStatusRead); + setqStatus(KMMsgStatusRead); else if (aStatusStr[0] == 'D') - seStatus(KMMsgStatusDeleted); + setqStatus(KMMsgStatusDeleted); else - seStatus(KMMsgStatusNew); + setqStatus(KMMsgStatusNew); } } @@ -363,117 +363,117 @@ void KMMsgBase::setSignatureStateChar( TQChar status, int idx ) //----------------------------------------------------------------------------- bool KMMsgBase::isUnread(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusUnread && !(st & KMMsgStatusIgnored)); } //----------------------------------------------------------------------------- bool KMMsgBase::isNew(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusNew && !(st & KMMsgStatusIgnored)); } //----------------------------------------------------------------------------- -bool KMMsgBase::isOfUnknownStatus(void) const +bool KMMsgBase::isOfUnknowntqStatus(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st == KMMsgStatusUnknown); } //----------------------------------------------------------------------------- bool KMMsgBase::isOld(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusOld); } //----------------------------------------------------------------------------- bool KMMsgBase::isRead(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusRead || st & KMMsgStatusIgnored); } //----------------------------------------------------------------------------- bool KMMsgBase::isDeleted(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusDeleted); } //----------------------------------------------------------------------------- bool KMMsgBase::isReplied(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusReplied); } //----------------------------------------------------------------------------- bool KMMsgBase::isForwarded(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusForwarded); } //----------------------------------------------------------------------------- bool KMMsgBase::isQueued(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusQueued); } //----------------------------------------------------------------------------- bool KMMsgBase::isTodo(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusTodo); } //----------------------------------------------------------------------------- bool KMMsgBase::isSent(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusSent); } //----------------------------------------------------------------------------- bool KMMsgBase::isImportant(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusFlag); } //----------------------------------------------------------------------------- bool KMMsgBase::isWatched(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusWatched); } //----------------------------------------------------------------------------- bool KMMsgBase::isIgnored(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusIgnored); } //----------------------------------------------------------------------------- bool KMMsgBase::isSpam(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusSpam); } //----------------------------------------------------------------------------- bool KMMsgBase::isHam(void) const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); return (st & KMMsgStatusHam); } //----------------------------------------------------------------------------- -TQCString KMMsgBase::statusToStr(const KMMsgStatus status) +TQCString KMMsgBase::statusToStr(const KMMsgtqStatus status) { TQCString sstr; if (status & KMMsgStatusNew) sstr += 'N'; @@ -587,8 +587,8 @@ TQCString KMMsgBase::toUsAscii(const TQString& _str, bool *ok) TQString result = _str; int len = result.length(); for (int i = 0; i < len; i++) - if (result.at(i).unicode() >= 128) { - result.at(i) = '?'; + if (result.tqat(i).tqunicode() >= 128) { + result.tqat(i) = '?'; all_ok = false; } if (ok) @@ -800,7 +800,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, unsigned int nonAscii = 0; unsigned int strLength(_str.length()); for (unsigned int i = 0; i < strLength; i++) - if (_str.at(i).unicode() >= 128) nonAscii++; + if (_str.tqat(i).tqunicode() >= 128) nonAscii++; bool useBase64 = (nonAscii * 6 > strLength); unsigned int start, stop, p, pos = 0, encLength; @@ -813,17 +813,17 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, start = pos; p = pos; while (p < strLength) { - if (!breakLine && (_str.at(p) == ' ' || dontQuote.find(_str.at(p)) != -1)) + if (!breakLine && (_str.tqat(p) == ' ' || dontQuote.find(_str.tqat(p)) != -1)) start = p + 1; - if (_str.at(p).unicode() >= 128 || _str.at(p).unicode() < 32) + if (_str.tqat(p).tqunicode() >= 128 || _str.tqat(p).tqunicode() < 32) break; p++; } if (breakLine || p < strLength) { - while (dontQuote.find(_str.at(start)) != -1) start++; + while (dontQuote.find(_str.tqat(start)) != -1) start++; stop = start; - while (stop < strLength && dontQuote.find(_str.at(stop)) == -1) + while (stop < strLength && dontQuote.find(_str.tqat(stop)) == -1) stop++; result += _str.mid(pos, start - pos).latin1(); encLength = encodeRFC2047Quoted(codec->fromUnicode(_str. @@ -843,7 +843,7 @@ TQCString KMMsgBase::encodeRFC2047String(const TQString& _str, stop = start + dif; } p = stop; - while (p > start && _str.at(p) != ' ') p--; + while (p > start && _str.tqat(p) != ' ') p--; if (p > start) stop = p; if (result.right(3) == "?= ") start--; if (result.right(5) == "?=\n ") { @@ -956,13 +956,13 @@ TQString KMMsgBase::decodeRFC2231String(const TQCString& _str) p = 0; while (p < (int)st.length()) { - if (st.at(p) == 37) + if (st.tqat(p) == 37) { - ch = st.at(p+1) - 48; + ch = st.tqat(p+1) - 48; if (ch > 16) ch -= 7; - ch2 = st.at(p+2) - 48; + ch2 = st.tqat(p+2) - 48; if (ch2 > 16) ch2 -= 7; - st.at(p) = ch * 16 + ch2; + st.tqat(p) = ch * 16 + ch2; st.remove( p+1, 2 ); } p++; @@ -1037,7 +1037,7 @@ TQCString KMMsgBase::autoDetectCharset(const TQCString &_encoding, const TQStrin TQStringList charsets = encodingList; if (!_encoding.isEmpty()) { - TQString currentCharset = TQString::fromLatin1(_encoding); + TQString currentCharset = TQString::tqfromLatin1(_encoding); charsets.remove(currentCharset); charsets.prepend(currentCharset); } @@ -1093,7 +1093,7 @@ unsigned long KMMsgBase::getMsgSerNum() const //----------------------------------------------------------------------------- KMMsgAttachmentState KMMsgBase::attachmentState() const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); if (st & KMMsgStatusHasAttach) return KMMsgHasAttachment; else if (st & KMMsgStatusHasNoAttach) @@ -1105,7 +1105,7 @@ KMMsgAttachmentState KMMsgBase::attachmentState() const KMMsgInvitationState KMMsgBase::invitationState() const { - KMMsgStatus st = status(); + KMMsgtqStatus st = status(); if (st & KMMsgStatusHasInvitation) return KMMsgHasInvitation; else if (st & KMMsgStatusHasNoInvitation) @@ -1119,9 +1119,9 @@ static void swapEndian(TQString &str) { uint len = str.length(); str = TQDeepCopy<TQString>(str); - TQChar *unicode = const_cast<TQChar*>( str.unicode() ); + TQChar *tqunicode = const_cast<TQChar*>( str.tqunicode() ); for (uint i = 0; i < len; i++) - unicode[i] = kmail_swap_16(unicode[i].unicode()); + tqunicode[i] = kmail_swap_16(tqunicode[i].tqunicode()); } //----------------------------------------------------------------------------- @@ -1193,7 +1193,7 @@ retry: } if(type == t) { // This works because the TQString constructor does a memcpy. - // Otherwise we would need to be concerned about the alignment. + // Otherwise we would need to be concerned about the tqalignment. if(l) ret = TQString((TQChar *)(g_chunk + g_chunk_offset), l/2); break; @@ -1371,23 +1371,23 @@ const uchar *KMMsgBase::asIndexString(int &length) const //these is at the beginning because it is queried quite often tmp_str = msgIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); - tmp = mLegacyStatus; + STORE_DATA_LEN(MsgIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); + tmp = mLegacytqStatus; STORE_DATA(MsgLegacyStatusPart, tmp); //these are completely arbitrary order tmp_str = fromStrip().stripWhiteSpace(); - STORE_DATA_LEN(MsgFromStripPart, tmp_str.unicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgFromStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); tmp_str = subject().stripWhiteSpace(); - STORE_DATA_LEN(MsgSubjectPart, tmp_str.unicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgSubjectPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); tmp_str = toStrip().stripWhiteSpace(); - STORE_DATA_LEN(MsgToStripPart, tmp_str.unicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgToStripPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); tmp_str = replyToIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgReplyToIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); tmp_str = xmark().stripWhiteSpace(); - STORE_DATA_LEN(MsgXMarkPart, tmp_str.unicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgXMarkPart, tmp_str.tqunicode(), tmp_str.length() * 2, true); tmp_str = fileName().stripWhiteSpace(); - STORE_DATA_LEN(MsgFilePart, tmp_str.unicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgFilePart, tmp_str.tqunicode(), tmp_str.length() * 2, true); tmp = msgSize(); STORE_DATA(MsgSizePart, tmp); tmp = folderOffset(); @@ -1400,10 +1400,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const STORE_DATA(MsgMDNSentPart, tmp); tmp_str = replyToAuxIdMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgReplyToAuxIdMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); tmp_str = strippedSubjectMD5().stripWhiteSpace(); - STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.unicode(), tmp_str.length() * 2, true); + STORE_DATA_LEN(MsgStrippedSubjectMD5Part, tmp_str.tqunicode(), tmp_str.length() * 2, true); tmp = status(); STORE_DATA(MsgStatusPart, tmp); @@ -1414,10 +1414,10 @@ const uchar *KMMsgBase::asIndexString(int &length) const STORE_DATA(MsgUIDPart, tmp); tmp_str = from(); - STORE_DATA_LEN( MsgFromPart, tmp_str.unicode(), tmp_str.length() * 2, true ); + STORE_DATA_LEN( MsgFromPart, tmp_str.tqunicode(), tmp_str.length() * 2, true ); tmp_str = to(); - STORE_DATA_LEN( MsgToPart, tmp_str.unicode(), tmp_str.length() * 2, true ); + STORE_DATA_LEN( MsgToPart, tmp_str.tqunicode(), tmp_str.length() * 2, true ); return ret; } @@ -1476,8 +1476,8 @@ TQString KMMsgBase::replacePrefixes( const TQString& str, // construct a big regexp that // 1. is anchored to the beginning of str (sans whitespace) // 2. matches at least one of the part regexps in prefixRegExps - TQString bigRegExp = TQString::fromLatin1("^(?:\\s+|(?:%1))+\\s*") - .arg( prefixRegExps.join(")|(?:") ); + TQString bigRegExp = TQString::tqfromLatin1("^(?:\\s+|(?:%1))+\\s*") + .tqarg( prefixRegExps.join(")|(?:") ); TQRegExp rx( bigRegExp, false /*case insens.*/ ); if ( !rx.isValid() ) { kdWarning(5006) << "KMMessage::replacePrefixes(): bigRegExp = \"" diff --git a/kmail/kmmsgbase.h b/kmail/kmmsgbase.h index 19c327aa2..43a101027 100644 --- a/kmail/kmmsgbase.h +++ b/kmail/kmmsgbase.h @@ -38,7 +38,7 @@ class KMFolderIndex; to Unread or New. This is done in KMMsgBase::isRead() and related getters. So we can preserve the state when switching a thread to Ignored and back. */ -enum MsgStatus +enum MsgtqStatus { KMMsgStatusUnknown = 0x00000000, KMMsgStatusNew = 0x00000001, @@ -62,7 +62,7 @@ enum MsgStatus KMMsgStatusHasNoInvitation = 0x00040000 }; -typedef uint KMMsgStatus; +typedef uint KMMsgtqStatus; /** The old status format, only one at a time possible. Needed for upgrade path purposes. */ @@ -80,7 +80,7 @@ typedef enum KMLegacyMsgStatusQueued='Q', KMLegacyMsgStatusSent='S', KMLegacyMsgStatusFlag='G' -} KMLegacyMsgStatus; +} KMLegacyMsgtqStatus; @@ -158,7 +158,7 @@ public: void setParent(KMFolder* p) { mParent = p; } /** Convert the given message status to a string. */ - static TQCString statusToStr(const KMMsgStatus status); + static TQCString statusToStr(const KMMsgtqStatus status); /** Convert the given message status to a string. */ TQString statusToSortRank(); @@ -173,7 +173,7 @@ public: virtual bool isNew(void) const; /** Returns TRUE if status is unknown. */ - virtual bool isOfUnknownStatus(void) const; + virtual bool isOfUnknowntqStatus(void) const; /** Returns TRUE if status is old. */ virtual bool isOld(void) const; @@ -215,14 +215,14 @@ public: virtual bool isHam(void) const; - /** Status of the message. */ - virtual KMMsgStatus status(void) const = 0; + /** tqStatus of the message. */ + virtual KMMsgtqStatus status(void) const = 0; /** Set status and mark dirty. Optional optimization: @p idx may * specify the index of this message within the parent folder. */ - virtual void seStatus(const KMMsgStatus status, int idx = -1); - virtual void toggleStatus(const KMMsgStatus status, int idx = -1); - virtual void seStatus(const char* statusField, const char* xstatusField=0); + virtual void setqStatus(const KMMsgtqStatus status, int idx = -1); + virtual void toggletqStatus(const KMMsgtqStatus status, int idx = -1); + virtual void setqStatus(const char* statusField, const char* xstatusField=0); /** Encryption status of the message. */ virtual KMMsgEncryptionState encryptionState() const = 0; @@ -450,16 +450,16 @@ protected: short mIndexLength; bool mDirty; bool mEnableUndo; - mutable KMMsgStatus mStatus; + mutable KMMsgtqStatus mtqStatus; // This is kept to provide an upgrade path from the the old single status // to the new multiple status scheme. - mutable KMLegacyMsgStatus mLegacyStatus; + mutable KMLegacyMsgtqStatus mLegacytqStatus; public: enum MsgPartType { MsgNoPart = 0, - //unicode strings + //tqunicode strings MsgFromStripPart = 1, MsgSubjectPart = 2, MsgToStripPart = 3, @@ -474,7 +474,7 @@ public: MsgFilePart = 11, MsgCryptoStatePart = 12, MsgMDNSentPart = 13, - //another two unicode strings + //another two tqunicode strings MsgReplyToAuxIdMD5Part = 14, MsgStrippedSubjectMD5Part = 15, // and another unsigned long diff --git a/kmail/kmmsginfo.cpp b/kmail/kmmsginfo.cpp index c2ce09582..8ce5f7cf3 100644 --- a/kmail/kmmsginfo.cpp +++ b/kmail/kmmsginfo.cpp @@ -154,7 +154,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMsgInfo& other) delete kd; kd = 0; } - mStatus = other.status(); + mtqStatus = other.status(); return *this; } #endif @@ -174,7 +174,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg) kd->strippedSubjectMD5 = msg.strippedSubjectMD5(); kd->msgIdMD5 = msg.msgIdMD5(); kd->xmark = msg.xmark(); - mStatus = msg.status(); + mtqStatus = msg.status(); kd->folderOffset = msg.folderOffset(); kd->msgSize = msg.msgSize(); kd->date = msg.date(); @@ -192,7 +192,7 @@ KMMsgInfo& KMMsgInfo::operator=(const KMMessage& msg) //----------------------------------------------------------------------------- void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, const TQCString& aTo, time_t aDate, - KMMsgStatus aStatus, const TQCString& aXMark, + KMMsgtqStatus atqStatus, const TQCString& aXMark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, KMMsgEncryptionState encryptionState, @@ -216,7 +216,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, kd->msgIdMD5 = base64EncodedMD5( msgId ); kd->xmark = aXMark; kd->folderOffset = aFolderOffset; - mStatus = aStatus; + mtqStatus = atqStatus; kd->msgSize = aMsgSize; kd->date = aDate; kd->file = ""; @@ -232,7 +232,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, const TQCString& aTo, time_t aDate, - KMMsgStatus aStatus, const TQCString& aXMark, + KMMsgtqStatus atqStatus, const TQCString& aXMark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, const TQCString& aFileName, @@ -244,7 +244,7 @@ void KMMsgInfo::init(const TQCString& aSubject, const TQCString& aFrom, size_t aMsgSizeServer, ulong aUID) { // use the "normal" init for most stuff - init( aSubject, aFrom, aTo, aDate, aStatus, aXMark, replyToId, replyToAuxId, + init( aSubject, aFrom, aTo, aDate, atqStatus, aXMark, replyToId, replyToAuxId, msgId, encryptionState, signatureState, mdnSentState, prefCharset, (unsigned long)0, aMsgSize, aMsgSizeServer, aUID ); kd->file = aFileName; @@ -477,16 +477,16 @@ void KMMsgInfo::setMDNSentState( const KMMsgMDNSentState s, int idx ) } //----------------------------------------------------------------------------- -KMMsgStatus KMMsgInfo::status(void) const +KMMsgtqStatus KMMsgInfo::status(void) const { - if (mStatus == KMMsgStatusUnknown) { - KMMsgStatus st = (KMMsgStatus)getLongPart(MsgStatusPart); + if (mtqStatus == KMMsgStatusUnknown) { + KMMsgtqStatus st = (KMMsgtqStatus)getLongPart(MsgStatusPart); if (!st) { // We are opening an old index for the first time, get the legacy // status and merge it in. - mLegacyStatus = (KMLegacyMsgStatus)getLongPart(MsgLegacyStatusPart); + mLegacytqStatus = (KMLegacyMsgtqStatus)getLongPart(MsgLegacyStatusPart); st = KMMsgStatusRead; - switch (mLegacyStatus) { + switch (mLegacytqStatus) { case KMLegacyMsgStatusUnknown: st = KMMsgStatusUnknown; break; @@ -525,9 +525,9 @@ KMMsgStatus KMMsgInfo::status(void) const } } - mStatus = st; + mtqStatus = st; } - return mStatus; + return mtqStatus; } @@ -666,11 +666,11 @@ void KMMsgInfo::setFileName(const TQString& file) } //----------------------------------------------------------------------------- -void KMMsgInfo::seStatus(const KMMsgStatus aStatus, int idx) +void KMMsgInfo::setqStatus(const KMMsgtqStatus atqStatus, int idx) { - if(aStatus == status()) + if(atqStatus == status()) return; - KMMsgBase::seStatus(aStatus, idx); //base does more "stuff" + KMMsgBase::setqStatus(atqStatus, idx); //base does more "stuff" } //----------------------------------------------------------------------------- @@ -716,7 +716,7 @@ void KMMsgInfo::compat_fromOldIndexString(const TQCString& str, bool toUtf8) kd->folderOffset = str.mid(2,9).toULong(); kd->msgSize = str.mid(12,9).toULong(); kd->date = (time_t)str.mid(22,10).toULong(); - mStatus = (KMMsgStatus)str.at(0); + mtqStatus = (KMMsgtqStatus)str.at(0); if (toUtf8) { kd->subject = str.mid(37, 100).stripWhiteSpace(); kd->fromStrip = str.mid(138, 50).stripWhiteSpace(); diff --git a/kmail/kmmsginfo.h b/kmail/kmmsginfo.h index ce15e3127..a3d50c449 100644 --- a/kmail/kmmsginfo.h +++ b/kmail/kmmsginfo.h @@ -39,7 +39,7 @@ public: /** Initialize with given values and set dirty flag to FALSE. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, - KMMsgStatus status, const TQCString& xmark, + KMMsgtqStatus status, const TQCString& xmark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, @@ -53,7 +53,7 @@ public: /** Initialize with given values and set dirty flag to FALSE. */ virtual void init(const TQCString& subject, const TQCString& from, const TQCString& to, time_t date, - KMMsgStatus status, const TQCString& xmark, + KMMsgtqStatus status, const TQCString& xmark, const TQCString& replyToId, const TQCString& replyToAuxId, const TQCString& msgId, @@ -78,7 +78,7 @@ public: virtual bool subjectIsPrefixed() const; virtual TQString msgIdMD5(void) const; virtual TQString fileName(void) const; - virtual KMMsgStatus status(void) const; + virtual KMMsgtqStatus status(void) const; virtual KMMsgEncryptionState encryptionState() const; virtual KMMsgSignatureState signatureState() const; virtual KMMsgMDNSentState mdnSentState() const; @@ -91,7 +91,7 @@ public: void setMsgSizeServer(size_t sz); void setFolderOffset(off_t offs); void setFileName(const TQString& file); - virtual void seStatus(const KMMsgStatus status, int idx = -1); + virtual void setqStatus(const KMMsgtqStatus status, int idx = -1); virtual void setDate(time_t aUnixTime); virtual void setSubject(const TQString&); virtual void setXMark(const TQString&); @@ -107,7 +107,7 @@ public: virtual void setTo( const TQString &to ); /** Grr.. c++! */ - virtual void seStatus(const char* s1, const char* s2=0) { KMMsgBase::seStatus(s1, s2); } + virtual void setqStatus(const char* s1, const char* s2=0) { KMMsgBase::setqStatus(s1, s2); } virtual void setDate(const char* s1) { KMMsgBase::setDate(s1); } virtual bool dirty(void) const; diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp index a76b8d021..447993db8 100644 --- a/kmail/kmmsgpart.cpp +++ b/kmail/kmmsgpart.cpp @@ -20,7 +20,7 @@ #include <mimelib/string.h> #include <kiconloader.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <assert.h> diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index 9d69f87c8..e4c41a402 100644 --- a/kmail/kmmsgpart.h +++ b/kmail/kmmsgpart.h @@ -58,7 +58,7 @@ public: **/ void setBodyFromUnicode( const TQString & str ); - /** Returns the body part decoded to unicode. + /** Returns the body part decoded to tqunicode. **/ TQString bodyToUnicode(const TQTextCodec* codec=0) const; diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp index de9717785..31a1e9321 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -23,7 +23,7 @@ // other TQt includes: #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klineedit.h> #include <tqcheckbox.h> @@ -54,7 +54,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, TQLabel * label; TQString msg; - setHelp( TQString::fromLatin1("attachments") ); + setHelp( TQString::tqfromLatin1("attachments") ); for ( int i = 0 ; i < numEncodingTypes ; ++i ) mI18nizedEncodings << i18n( encodingTypes[i].displayName ); @@ -73,14 +73,14 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, mMimeType->setInsertionPolicy( TQComboBox::NoInsertion ); mMimeType->setValidator( new KMimeTypeValidator( TQT_TQOBJECT(mMimeType) ) ); mMimeType->insertStringList( TQStringList() - << TQString::fromLatin1("text/html") - << TQString::fromLatin1("text/plain") - << TQString::fromLatin1("image/gif") - << TQString::fromLatin1("image/jpeg") - << TQString::fromLatin1("image/png") - << TQString::fromLatin1("application/octet-stream") - << TQString::fromLatin1("application/x-gunzip") - << TQString::fromLatin1("application/zip") ); + << TQString::tqfromLatin1("text/html") + << TQString::tqfromLatin1("text/plain") + << TQString::tqfromLatin1("image/gif") + << TQString::tqfromLatin1("image/jpeg") + << TQString::tqfromLatin1("image/png") + << TQString::tqfromLatin1("application/octet-stream") + << TQString::tqfromLatin1("application/x-gunzip") + << TQString::tqfromLatin1("application/zip") ); connect( mMimeType, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotMimeTypeChanged(const TQString&)) ); glay->addWidget( mMimeType, 0, 1 ); @@ -89,7 +89,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "<p>normally, you do not need to touch this setting, since the " "type of the file is automatically checked; but, sometimes, %1 " "may not detect the type correctly -- here is where you can fix " - "that.</p></qt>").arg( kapp->aboutData()->programName() ); + "that.</p></qt>").tqarg( kapp->aboutData()->programName() ); TQWhatsThis::add( mMimeType, msg ); // row 1: Size label: @@ -102,7 +102,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "because calculating the exact size would take too much time; " "when this is the case, it will be made visible by adding " "\"(est.)\" to the size displayed.</p></qt>") - .arg( kapp->aboutData()->programName() ); + .tqarg( kapp->aboutData()->programName() ); TQWhatsThis::add( mSize, msg ); // row 2: "Name" lineedit and label: @@ -148,7 +148,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, "binary data, but consists of pure text -- in this case, choosing " "\"quoted-printable\" over the default \"base64\" will save up " "to 25% in resulting message size.</p></qt>") - .arg( kapp->aboutData()->programName() ); + .tqarg( kapp->aboutData()->programName() ); TQWhatsThis::add( label, msg ); TQWhatsThis::add( mEncoding, msg ); @@ -210,7 +210,7 @@ void KMMsgPartDialog::setMimeType( const TQString & mimeType ) { void KMMsgPartDialog::setMimeType( const TQString & type, const TQString & subtype ) { - setMimeType( TQString::fromLatin1("%1/%2").arg(type).arg(subtype) ); + setMimeType( TQString::tqfromLatin1("%1/%2").tqarg(type).tqarg(subtype) ); } void KMMsgPartDialog::setMimeTypeList( const TQStringList & mimeTypes ) { @@ -221,7 +221,7 @@ void KMMsgPartDialog::setSize( KIO::filesize_t size, bool estimated ) { TQString text = KIO::convertSize( size ); if ( estimated ) text = i18n("%1: a filesize incl. unit (e.g. \"1.3 KB\")", - "%1 (est.)").arg( text ); + "%1 (est.)").tqarg( text ); mSize->setText( text ); } diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index b8037f7c1..987485969 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -12,7 +12,7 @@ #include "kmpopfiltercnfrmdlg.h" #include "kmheaders.h" -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqheader.h> #include <tqcheckbox.h> @@ -292,7 +292,7 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons TQLabel *l = new TQLabel(i18n("Messages to filter found on POP Account: <b>%1</b><p>" "The messages shown exceed the maximum size limit you defined for this account.<br>You can select " - "what you want to do with them by checking the appropriate button.").arg(aAccount), w); + "what you want to do with them by checking the appropriate button.").tqarg(aAccount), w); vbl->addWidget(l); TQVGroupBox *upperBox = new TQVGroupBox(i18n("Messages Exceeding Size"), w); @@ -360,7 +360,7 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons } if(rulesetCount) - lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").arg(rulesetCount)); + lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").tqarg(rulesetCount)); // connect signals and slots connect(lv, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), @@ -464,7 +464,7 @@ void KMPopFilterCnfrmDlg::slotToggled(bool aOn) void KMPopFilterCnfrmDlg::slotUpdateMinimumSize() { - mainWidget()->setMinimumSize(mainWidget()->sizeHint()); + mainWidget()->setMinimumSize(mainWidget()->tqsizeHint()); } #include "kmpopfiltercnfrmdlg.moc" diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index ea92f7ee6..505bd6128 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -111,11 +111,11 @@ using KMail::TeeHtmlWriter; #include <kasciistricmp.h> #include <kurldrag.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqhbox.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqpaintdevicemetrics.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqsplitter.h> #include <tqstyle.h> @@ -150,7 +150,7 @@ NewByteArray& NewByteArray::appendNULL() { TQByteArray::detach(); uint len1 = size(); - if ( !TQByteArray::resize( len1 + 1 ) ) + if ( !TQByteArray::tqresize( len1 + 1 ) ) return *this; *(data() + len1) = '\0'; return *this; @@ -162,7 +162,7 @@ NewByteArray& NewByteArray::operator+=( const char * newData ) TQByteArray::detach(); uint len1 = size(); uint len2 = tqstrlen( newData ); - if ( !TQByteArray::resize( len1 + len2 ) ) + if ( !TQByteArray::tqresize( len1 + len2 ) ) return *this; memcpy( data() + len1, newData, len2 ); return *this; @@ -174,7 +174,7 @@ NewByteArray& NewByteArray::operator+=( const TQByteArray & newData ) TQByteArray::detach(); uint len1 = size(); uint len2 = newData.size(); - if ( !TQByteArray::resize( len1 + len2 ) ) + if ( !TQByteArray::tqresize( len1 + len2 ) ) return *this; memcpy( data() + len1, newData.data(), len2 ); return *this; @@ -186,7 +186,7 @@ NewByteArray& NewByteArray::operator+=( const TQCString & newData ) TQByteArray::detach(); uint len1 = size(); uint len2 = newData.length(); // forget about the trailing 0x00 ! - if ( !TQByteArray::resize( len1 + len2 ) ) + if ( !TQByteArray::tqresize( len1 + len2 ) ) return *this; memcpy( data() + len1, newData.data(), len2 ); return *this; @@ -207,7 +207,7 @@ void KMReaderWin::objectTreeToDecryptedMsg( partNode* node, int recCount ) { kdDebug(5006) << TQString("-------------------------------------------------" ) << endl; - kdDebug(5006) << TQString("KMReaderWin::objectTreeToDecryptedMsg( %1 ) START").arg( recCount ) << endl; + kdDebug(5006) << TQString("KMReaderWin::objectTreeToDecryptedMsg( %1 ) START").tqarg( recCount ) << endl; if( node ) { kdDebug(5006) << node->typeString() << '/' << node->subTypeString() << endl; @@ -309,10 +309,10 @@ kdDebug(5006) << " new Content-Type = " << headers->ContentType( // B) Store the body of this part. if( headers && bIsMultipart && dataNode->firstChild() ) { -kdDebug(5006) << "is valid Multipart, processing children:" << endl; +kdDebug(5006) << "is valid Multipart, processing tqchildren:" << endl; TQCString boundary = headers->ContentType().Boundary().c_str(); curNode = dataNode->firstChild(); - // store children of multipart + // store tqchildren of multipart while( curNode ) { kdDebug(5006) << "--boundary" << endl; if( resultingData.size() && @@ -323,7 +323,7 @@ kdDebug(5006) << "--boundary" << endl; resultingData += boundary; resultingData += "\n"; // note: We are processing a harmless multipart that is *not* - // to be replaced by one of it's children, therefor + // to be replaced by one of it's tqchildren, therefor // we set their doStoreHeaders to true. objectTreeToDecryptedMsg( curNode, resultingData, @@ -336,7 +336,7 @@ kdDebug(5006) << "--boundary--" << endl; resultingData += "\n--"; resultingData += boundary; resultingData += "--\n\n"; -kdDebug(5006) << "Multipart processing children - DONE" << endl; +kdDebug(5006) << "Multipart processing tqchildren - DONE" << endl; } else if( part ){ // store simple part kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE" << endl; @@ -360,7 +360,7 @@ kdDebug(5006) << " Root node will NOT be replaced." << endl recCount + 1 ); } } - kdDebug(5006) << TQString("\nKMReaderWin::objectTreeToDecryptedMsg( %1 ) END").arg( recCount ) << endl; + kdDebug(5006) << TQString("\nKMReaderWin::objectTreeToDecryptedMsg( %1 ) END").tqarg( recCount ) << endl; } @@ -1027,14 +1027,14 @@ void KMReaderWin::contacStatusChanged( const TQString &uid) // kdDebug( 5006 ) << k_funcinfo << " got a presence change for " << uid << endl; // get the list of nodes for this contact from the htmlView DOM::NodeList presenceNodes = mViewer->htmlDocument() - .getElementsByName( DOM::DOMString( TQString::fromLatin1("presence-") + uid ) ); + .getElementsByName( DOM::DOMString( TQString::tqfromLatin1("presence-") + uid ) ); for ( unsigned int i = 0; i < presenceNodes.length(); ++i ) { DOM::Node n = presenceNodes.item( i ); kdDebug( 5006 ) << "name is " << n.nodeName().string() << endl; kdDebug( 5006 ) << "value of content was " << n.firstChild().nodeValue().string() << endl; TQString newPresence = kmkernel->imProxy()->presenceString( uid ); if ( newPresence.isNull() ) // KHTML crashes if you setNodeValue( TQString() ) - newPresence = TQString::fromLatin1( "ENOIMRUNNING" ); + newPresence = TQString::tqfromLatin1( "ENOIMRUNNING" ); n.firstChild().setNodeValue( newPresence ); // kdDebug( 5006 ) << "value of content is now " << n.firstChild().nodeValue().string() << endl; } @@ -1285,11 +1285,11 @@ void KMReaderWin::displaySplashPage( const TQString &info ) TQString location = locate("data", "kmail/about/main.html"); TQString content = KPIM::kFileToString(location); - content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); + content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); + content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) ); else - content = content.arg( "" ); + content = content.tqarg( "" ); mViewer->begin(KURL( location )); @@ -1297,7 +1297,7 @@ void KMReaderWin::displaySplashPage( const TQString &info ) TQString appTitle = i18n("KMail"); TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite"); TQString quickDescription = i18n("The email client for the K Desktop Environment."); - mViewer->write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info)); + mViewer->write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info)); mViewer->end(); } @@ -1345,41 +1345,41 @@ void KMReaderWin::displayAboutPage() "<p>We hope that you will enjoy KMail.</p>\n" "<p>Thank you,</p>\n" "<p style='margin-bottom: 0px'> The KMail Team</p>") - .arg(KMAIL_VERSION) // KMail version - .arg("help:/kmail/index.html") // KMail help:// URL - .arg("http://kontact.kde.org/kmail/") // KMail homepage URL - .arg("1.8").arg("3.4"); // prior KMail and KDE version + .tqarg(KMAIL_VERSION) // KMail version + .tqarg("help:/kmail/index.html") // KMail help:// URL + .tqarg("http://kontact.kde.org/kmail/") // KMail homepage URL + .tqarg("1.8").tqarg("3.4"); // prior KMail and KDE version TQString featureItems; for ( int i = 0 ; i < numKMailNewFeatures ; i++ ) - featureItems += i18n("<li>%1</li>\n").arg( i18n( kmailNewFeatures[i] ) ); + featureItems += i18n("<li>%1</li>\n").tqarg( i18n( kmailNewFeatures[i] ) ); - info = info.arg( featureItems ); + info = info.tqarg( featureItems ); if( kmkernel->firstStart() ) { - info = info.arg( i18n("<p>Please take a moment to fill in the KMail " + info = info.tqarg( i18n("<p>Please take a moment to fill in the KMail " "configuration panel at Settings->Configure " "KMail.\n" "You need to create at least a default identity and " "an incoming as well as outgoing mail account." "</p>\n") ); } else { - info = info.arg( TQString() ); + info = info.tqarg( TQString() ); } if ( ( numKMailChanges > 1 ) || ( numKMailChanges == 1 && strlen(kmailChanges[0]) > 0 ) ) { TQString changesText = i18n("<p><span style='font-size:125%; font-weight:bold;'>" "Important changes</span> (compared to KMail %1):</p>\n") - .arg("1.8"); + .tqarg("1.8"); changesText += "<ul>\n"; for ( int i = 0 ; i < numKMailChanges ; i++ ) - changesText += i18n("<li>%1</li>\n").arg( i18n( kmailChanges[i] ) ); + changesText += i18n("<li>%1</li>\n").tqarg( i18n( kmailChanges[i] ) ); changesText += "</ul>\n"; - info = info.arg( changesText ); + info = info.tqarg( changesText ); } else - info = info.arg(""); // remove the %8 + info = info.tqarg(""); // remove the %8 displaySplashPage( info ); } @@ -1976,7 +1976,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo menu->insertItem(SmallIcon("edit"), i18n("Edit Attachment"), 8 ); if ( GlobalSettings::self()->allowAttachmentDeletion() && canChange ) menu->insertItem(SmallIcon("editdelete"), i18n("Delete Attachment"), 7 ); - if ( name.endsWith( ".xia", false ) && + if ( name.tqendsWith( ".xia", false ) && Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) menu->insertItem( i18n( "Decrypt With Chiasmus..." ), 6 ); menu->insertItem(i18n("Properties"), 5); @@ -2000,9 +2000,9 @@ void KMReaderWin::setStyleDependantFrameWidth() // set the width of the frame to a reasonable value for the current GUI style int frameWidth; if( tqstyle().isA("KeramikStyle") ) - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; + frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) - 1; else - frameWidth = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); + frameWidth = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); if ( frameWidth < 0 ) frameWidth = 0; if ( frameWidth != mBox->lineWidth() ) @@ -2041,7 +2041,7 @@ void KMReaderWin::slotHandleAttachment( int choice ) if (!url.isValid() ) return; urls.append( url ); KURLDrag* drag = new KURLDrag( urls, this ); - TQApplication::clipboard()->setData( drag, TQClipboard::Clipboard ); + TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); } else if ( choice == 10 ) { // Scroll To scrollToAttachment( node ); } @@ -2142,7 +2142,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, } htmlWriter()->queue("</body></html>"); htmlWriter()->flush(); - mMainWindow->setCaption(i18n("View Attachment: %1").arg(pname)); + mMainWindow->setCaption(i18n("View Attachment: %1").tqarg(pname)); } else if (kasciistricmp(aMsgPart->typeStr(), "image")==0 || (kasciistricmp(aMsgPart->typeStr(), "application")==0 && kasciistricmp(aMsgPart->subtypeStr(), "postscript")==0)) @@ -2178,7 +2178,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, "\" border=\"0\">\n" "</body></html>\n" ); htmlWriter()->end(); - setCaption( i18n("View Attachment: %1").arg( pname ) ); + setCaption( i18n("View Attachment: %1").tqarg( pname ) ); show(); delete iio; } else { @@ -2198,7 +2198,7 @@ void KMReaderWin::setMsgPart( KMMessagePart* aMsgPart, bool aHTML, htmlWriter()->queue( "</pre>" ); htmlWriter()->queue("</body></html>"); htmlWriter()->flush(); - mMainWindow->setCaption(i18n("View Attachment: %1").arg(pname)); + mMainWindow->setCaption(i18n("View Attachment: %1").tqarg(pname)); } // ---Sven's view text, html and image attachments in html widget end --- } @@ -2267,7 +2267,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) // determine the MIME type of the attachment KMimeType::Ptr mimetype; // prefer the value of the Content-Type header - mimetype = KMimeType::mimeType( TQString::fromLatin1( contentTypeStr ) ); + mimetype = KMimeType::mimeType( TQString::tqfromLatin1( contentTypeStr ) ); if ( mimetype->name() == "application/octet-stream" ) { // consider the filename if Content-Type is application/octet-stream mimetype = KMimeType::findByPath( name, 0, true /* no disk access */ ); @@ -2287,17 +2287,17 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) if ( filenameText.isEmpty() ) filenameText = msgPart.name(); if ( offer ) { - open_text = i18n("&Open with '%1'").arg( offer->name() ); + open_text = i18n("&Open with '%1'").tqarg( offer->name() ); } else { open_text = i18n("&Open With..."); } const TQString text = i18n("Open attachment '%1'?\n" "Note that opening an attachment may compromise " "your system's security.") - .arg( filenameText ); + .tqarg( filenameText ); const int choice = KMessageBox::questionYesNoCancel( this, text, i18n("Open Attachment?"), KStdGuiItem::saveAs(), open_text, - TQString::fromLatin1("askSave") + mimetype->name() ); // dontAskAgainName + TQString::tqfromLatin1("askSave") + mimetype->name() ); // dontAskAgainName if( choice == KMessageBox::Yes ) { // Save mAtmUpdate = true; @@ -2738,7 +2738,7 @@ void KMReaderWin::fillCommandInfo( partNode *node, KMMessage **msg, int *nodeId void KMReaderWin::slotDeleteAttachment(partNode * node) { if ( KMessageBox::warningContinueCancel( this, - i18n("Deleting an attachment might invalidate any digital signature on this message."), + i18n("Deleting an attachment might tqinvalidate any digital signature on this message."), i18n("Delete Attachment"), KStdGuiItem::del(), "DeleteAttachmentSignatureWarning" ) != KMessageBox::Continue ) { return; @@ -2794,7 +2794,7 @@ void KMReaderWin::disconnectMsgAdded() void KMReaderWin::slotEditAttachment(partNode * node) { if ( KMessageBox::warningContinueCancel( this, - i18n("Modifying an attachment might invalidate any digital signature on this message."), + i18n("Modifying an attachment might tqinvalidate any digital signature on this message."), i18n("Edit Attachment"), KGuiItem( i18n("Edit"), "edit" ), "EditAttachmentSignatureWarning" ) != KMessageBox::Continue ) { return; @@ -2828,12 +2828,12 @@ void KMReaderWin::scrollToAttachment( const partNode *node ) DOM::Document doc = mViewer->htmlDocument(); // The anchors for this are created in ObjectTreeParser::parseObjectTree() - mViewer->gotoAnchor( TQString::fromLatin1( "att%1" ).arg( node->nodeId() ) ); + mViewer->gotoAnchor( TQString::tqfromLatin1( "att%1" ).tqarg( node->nodeId() ) ); // Remove any old color markings which might be there const partNode *root = node->topLevelParent(); for ( int i = 0; i <= root->totalChildCount() + 1; i++ ) { - DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).arg( i + 1 ) ); + DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).tqarg( i + 1 ) ); if ( !attachmentDiv.isNull() ) attachmentDiv.removeAttribute( "style" ); } @@ -2845,14 +2845,14 @@ void KMReaderWin::scrollToAttachment( const partNode *node ) // Now, color the div of the attachment in yellow, so that the user sees what happened. // We created a special marked div for this in writeAttachmentMarkHeader() in ObjectTreeParser, // find and modify that now. - DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).arg( node->nodeId() ) ); + DOM::Element attachmentDiv = doc.getElementById( TQString( "attachmentDiv%1" ).tqarg( node->nodeId() ) ); if ( attachmentDiv.isNull() ) { kdWarning( 5006 ) << "Could not find attachment div for attachment " << node->nodeId() << endl; return; } attachmentDiv.setAttribute( "style", TQString( "border:2px solid %1" ) - .arg( cssHelper()->pgpWarnColor().name() ) ); + .tqarg( cssHelper()->pgpWarnColor().name() ) ); // Update rendering, otherwise the rendering is not updated when the user clicks on an attachment // that causes scrolling and the open attachment dialog @@ -2880,7 +2880,7 @@ void KMReaderWin::injectAttachments() imgSrc.append( "attachmentQuicklistOpened.png" ); } - TQString html = renderAttachments( mRootNode, TQApplication::palette().active().background() ); + TQString html = renderAttachments( mRootNode, TQApplication::tqpalette().active().background() ); if ( html.isEmpty() ) return; @@ -2889,7 +2889,7 @@ void KMReaderWin::injectAttachments() link += "<div style=\"text-align: left;\"><a href=\"" + urlHandle + "\"><img src=\"" + imgpath + imgSrc + "\"/></a></div>"; html.prepend( link ); - html.prepend( TQString::fromLatin1( "<div style=\"float:left;\">%1 </div>" ). + html.prepend( TQString::tqfromLatin1( "<div style=\"float:left;\">%1 </div>" ). arg( i18n( "Attachments:" ) ) ); } else { link += "<div style=\"text-align: right;\"><a href=\"" + urlHandle + "\"><img src=\"" + @@ -2930,9 +2930,9 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor if ( headerStyle() == HeaderStyle::enterprise() ) align = "right"; if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode ) - html += TQString::fromLatin1("<div style=\"background:%1; %2" - "vertical-align:middle; float:%3; %4\">").arg( bgColor.name() ).arg( margin ) - .arg( align ).arg( visibility ); + html += TQString::tqfromLatin1("<div style=\"background:%1; %2" + "vertical-align:middle; float:%3; %4\">").tqarg( bgColor.name() ).tqarg( margin ) + .tqarg( align ).tqarg( visibility ); html += subHtml; if ( node->msgPart().typeStr().lower() == "message" || node == mRootNode ) html += "</div>"; @@ -2941,11 +2941,11 @@ TQString KMReaderWin::renderAttachments(partNode * node, const TQColor &bgColor partNode::AttachmentDisplayInfo info = node->attachmentDisplayInfo(); if ( info.displayInHeader ) { html += "<div style=\"float:left;\">"; - html += TQString::fromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).arg( bgColor.name() ); + html += TQString::tqfromLatin1( "<span style=\"white-space:nowrap; border-width: 0px; border-left-width: 5px; border-color: %1; 2px; border-left-style: solid;\">" ).tqarg( bgColor.name() ); TQString fileName = writeMessagePartToTempFile( &node->msgPart(), node->nodeId() ); TQString href = node->asHREF( "header" ); - html += TQString::fromLatin1( "<a href=\"" ) + href + - TQString::fromLatin1( "\">" ); + html += TQString::tqfromLatin1( "<a href=\"" ) + href + + TQString::tqfromLatin1( "\">" ); html += "<img style=\"vertical-align:middle;\" src=\"" + info.icon + "\"/> "; if ( headerStyle() == HeaderStyle::enterprise() ) { TQFont bodyFont = mCSSHelper->bodyFont( isFixedFont() ); diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index 0e102e64c..7d72cd787 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -370,7 +370,7 @@ public slots: /** Refresh the reader window */ void updateReaderWin(); - /** HTML Widget scrollbar and layout handling. */ + /** HTML Widget scrollbar and tqlayout handling. */ void slotScrollUp(); void slotScrollDown(); void slotScrollPrior(); diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp index 1d6fd95d7..4c4340a2b 100644 --- a/kmail/kmsearchpattern.cpp +++ b/kmail/kmsearchpattern.cpp @@ -41,7 +41,7 @@ static const int numFuncConfigNames = sizeof funcConfigNames / sizeof *funcConfi struct _statusNames { const char* name; - KMMsgStatus status; + KMMsgtqStatus status; }; static struct _statusNames statusNames[] = { @@ -104,7 +104,7 @@ KMSearchRule * KMSearchRule::createInstance( const TQCString & field, { KMSearchRule *ret = 0; if (field == "<status>") - ret = new KMSearchRuleStatus( field, func, contents ); + ret = new KMSearchRuletqStatus( field, func, contents ); else if ( field == "<age in days>" || field == "<size>" ) ret = new KMSearchRuleNumerical( field, func, contents ); else @@ -550,7 +550,7 @@ bool KMSearchRuleNumerical::matches( const KMMessage * msg ) const } else if ( field() == "<age in days>" ) { TQDateTime msgDateTime; msgDateTime.setTime_t( msg->date() ); - numericalMsgContents = msgDateTime.daysTo( TQDateTime::currentDateTime() ); + numericalMsgContents = msgDateTime.daysTo( TQDateTime::tqcurrentDateTime() ); numericalValue = contents().toInt(); msgContents.setNum( numericalMsgContents ); } @@ -622,10 +622,10 @@ bool KMSearchRuleNumerical::matchesInternal( long numericalValue, //================================================== // -// class KMSearchRuleStatus +// class KMSearchRuletqStatus // //================================================== -TQString englishNameForStatus( const KMMsgStatus& status ) +TQString englishNameFortqStatus( const KMMsgtqStatus& status ) { for ( int i=0; i< numStatusNames; i++ ) { if ( statusNames[i].status == status ) { @@ -635,22 +635,22 @@ TQString englishNameForStatus( const KMMsgStatus& status ) return TQString(); } -KMSearchRuleStatus::KMSearchRuleStatus( const TQCString & field, +KMSearchRuletqStatus::KMSearchRuletqStatus( const TQCString & field, Function func, const TQString & aContents ) : KMSearchRule(field, func, aContents) { // the values are always in english, both from the conf file as well as // the patternedit gui - mStatus = statusFromEnglishName( aContents ); + mtqStatus = statusFromEnglishName( aContents ); } -KMSearchRuleStatus::KMSearchRuleStatus( int status, Function func ) -: KMSearchRule( "<status>", func, englishNameForStatus( status ) ) +KMSearchRuletqStatus::KMSearchRuletqStatus( int status, Function func ) +: KMSearchRule( "<status>", func, englishNameFortqStatus( status ) ) { - mStatus = status; + mtqStatus = status; } -KMMsgStatus KMSearchRuleStatus::statusFromEnglishName( const TQString & aStatusString ) +KMMsgtqStatus KMSearchRuletqStatus::statusFromEnglishName( const TQString & aStatusString ) { for ( int i=0; i< numStatusNames; i++ ) { if ( !aStatusString.compare( statusNames[i].name ) ) { @@ -660,33 +660,33 @@ KMMsgStatus KMSearchRuleStatus::statusFromEnglishName( const TQString & aStatusS return KMMsgStatusUnknown; } -bool KMSearchRuleStatus::isEmpty() const +bool KMSearchRuletqStatus::isEmpty() const { return field().stripWhiteSpace().isEmpty() || contents().isEmpty(); } -bool KMSearchRuleStatus::matches( const DwString &, KMMessage &, +bool KMSearchRuletqStatus::matches( const DwString &, KMMessage &, const DwBoyerMoore *, int ) const { assert( 0 ); return false; // don't warn } -bool KMSearchRuleStatus::matches( const KMMessage * msg ) const +bool KMSearchRuletqStatus::matches( const KMMessage * msg ) const { - KMMsgStatus msgStatus = msg->status(); + KMMsgtqStatus msgtqStatus = msg->status(); bool rc = false; switch ( function() ) { case FuncEquals: // fallthrough. So that "<status> 'is' 'read'" works case FuncContains: - if (msgStatus & mStatus) + if (msgtqStatus & mtqStatus) rc = true; break; case FuncNotEqual: // fallthrough. So that "<status> 'is not' 'read'" works case FuncContainsNot: - if (! (msgStatus & mStatus) ) + if (! (msgtqStatus & mtqStatus) ) rc = true; break; // FIXME what about the remaining funcs, how can they make sense for diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h index b60e9cdc8..87533a250 100644 --- a/kmail/kmsearchpattern.h +++ b/kmail/kmsearchpattern.h @@ -10,7 +10,7 @@ #include <tqptrlist.h> #include <tqstring.h> #include <tqcstring.h> -#include "kmmsgbase.h" // for KMMsgStatus +#include "kmmsgbase.h" // for KMMsgtqStatus class KMMessage; class KConfig; @@ -208,13 +208,13 @@ public: namespace KMail { // The below are used in several places and here so they are accessible. - struct MessageStatus { + struct MessagetqStatus { const char * const text; const char * const icon; }; // If you change the ordering here; also do it in the enum below - static const MessageStatus StatusValues[] = { + static const MessagetqStatus StatusValues[] = { { I18N_NOOP( "Important" ), "kmmsgflag" }, { I18N_NOOP( "New" ), "kmmsgnew" }, { I18N_NOOP( "Unread" ), "kmmsgunseen" }, @@ -255,7 +255,7 @@ namespace KMail { }; static const int StatusValueCount = - sizeof( StatusValues ) / sizeof( MessageStatus ); + sizeof( StatusValues ) / sizeof( MessagetqStatus ); // we want to show all status entries in the quick search bar, but only the // ones up to attachment in the search/filter dialog, because there the // attachment case is handled separately. @@ -267,12 +267,12 @@ namespace KMail { @short This class represents a search pattern rule operating on message status. */ -class KMSearchRuleStatus : public KMSearchRule +class KMSearchRuletqStatus : public KMSearchRule { public: - KMSearchRuleStatus( const TQCString & field=0, Function function=FuncContains, + KMSearchRuletqStatus( const TQCString & field=0, Function function=FuncContains, const TQString & contents=TQString() ); - KMSearchRuleStatus( int status, Function function=FuncContains ); + KMSearchRuletqStatus( int status, Function function=FuncContains ); virtual bool isEmpty() const ; virtual bool matches( const KMMessage * msg ) const; @@ -280,9 +280,9 @@ public: virtual bool matches( const DwString &, KMMessage &, const DwBoyerMoore *, int ) const; - static KMMsgStatus statusFromEnglishName(const TQString&); + static KMMsgtqStatus statusFromEnglishName(const TQString&); private: - KMMsgStatus mStatus; + KMMsgtqStatus mtqStatus; }; // ------------------------------------------------------------------------ diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp index f40f842f5..f21bee17f 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -18,7 +18,7 @@ using KMail::RuleWidgetHandlerManager; #include <tqcombobox.h> #include <tqbuttongroup.h> #include <tqwidgetstack.h> -#include <layout.h> +#include <tqlayout.h> #include <assert.h> @@ -106,12 +106,12 @@ void KMSearchRuleWidget::initWidget() // initialize the function/value widget stack mFunctionStack = new TQWidgetStack( this, "mFunctionStack" ); //Don't expand the widget in vertical direction - mFunctionStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed ); + mFunctionStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed ); hlay->addWidget( mFunctionStack ); mValueStack = new TQWidgetStack( this, "mValueStack" ); - mValueStack->setSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed ); + mValueStack->tqsetSizePolicy( TQSizePolicy::Preferred,TQSizePolicy::Fixed ); hlay->addWidget( mValueStack ); hlay->setStretchFactor( mValueStack, 10 ); @@ -143,7 +143,7 @@ void KMSearchRuleWidget::setRule( KMSearchRule *aRule ) mRuleField->blockSignals( true ); if ( i < 0 ) { // not found -> user defined field - mRuleField->changeItem( TQString::fromLatin1( aRule->field() ), 0 ); + mRuleField->changeItem( TQString::tqfromLatin1( aRule->field() ), 0 ); i = 0; } else { // found in the list of predefined fields mRuleField->changeItem( TQString(), 0 ); diff --git a/kmail/kmsearchpatternedit.h b/kmail/kmsearchpatternedit.h index 625d8f864..e42ae080d 100644 --- a/kmail/kmsearchpatternedit.h +++ b/kmail/kmsearchpatternedit.h @@ -46,7 +46,7 @@ public: be used to initialize the widget. */ KMSearchRuleWidget( TQWidget* parent=0, KMSearchRule* aRule=0, const char* name=0, bool headersOnly = false, bool absoluteDates = false ); - enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, Status, + enum { Message, Body, AnyHeader, Recipients, Size, AgeInDays, tqStatus, Subject, From, To, CC, ReplyTo, Organization }; /** Set whether only header fields can be searched. If @p is true only diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index eda44482a..761f4d60a 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -80,7 +80,7 @@ KMSender::~KMSender() void KMSender::seStatusMsg(const TQString &msg) { if ( mProgressItem ) - mProgressItem->seStatus(msg); + mProgressItem->setqStatus(msg); } //----------------------------------------------------------------------------- @@ -164,7 +164,7 @@ bool KMSender::doSend(KMMessage* aMsg, short sendNow) KMFolder * const outbox = kmkernel->outboxFolder(); const KMFolderOpener openOutbox( outbox, "outbox" ); - aMsg->seStatus(KMMsgStatusQueued); + aMsg->setqStatus(KMMsgStatusQueued); if ( const int err = outbox->addMsg(aMsg) ) { Q_UNUSED( err ); @@ -314,8 +314,8 @@ void KMSender::doSendMsg() mCurrentMsg->addBodyPart( &msgPart ); } } - mCurrentMsg->seStatus(KMMsgStatusSent); - mCurrentMsg->seStatus(KMMsgStatusRead); // otherwise it defaults to new on imap + mCurrentMsg->setqStatus(KMMsgStatusSent); + mCurrentMsg->setqStatus(KMMsgStatusRead); // otherwise it defaults to new on imap mCurrentMsg->updateAttachmentState(); mCurrentMsg->updateInvitationState(); @@ -387,7 +387,7 @@ void KMSender::doSendMsg() "\"outbox\" to the \"sent-mail\" folder failed.\n" "Possible reasons are lack of disk space or write permission. " "Please try to fix the problem and move the message manually.") - .arg(mCurrentMsg->subject())); + .tqarg(mCurrentMsg->subject())); cleanup(); return; } @@ -435,7 +435,7 @@ void KMSender::doSendMsg() "identity '%1' in the Identities " "section of the configuration dialog " "and then try again." ) - .arg( id.identityName() ) ); + .tqarg( id.identityName() ) ); mOutboxFolder->unGetMsg( mFailedMessages ); mCurrentMsg = 0; } @@ -455,7 +455,7 @@ void KMSender::doSendMsg() mSentMessages)); } else { seStatusMsg(i18n("%1 of %2 queued messages successfully sent.") - .arg(mSentMessages).arg( mTotalMessages )); + .tqarg(mSentMessages).tqarg( mTotalMessages )); } } cleanup(); @@ -536,7 +536,7 @@ void KMSender::doSendMsg() } bool KMSender::runPrecommand( const TQString & cmd ) { - seStatusMsg( i18n("Executing precommand %1").arg( cmd ) ); + seStatusMsg( i18n("Executing precommand %1").tqarg( cmd ) ); mPrecommand = new KMPrecommand( cmd ); connect( mPrecommand, TQT_SIGNAL(finished(bool)), TQT_SLOT(slotPrecommandFinished(bool)) ); @@ -596,8 +596,8 @@ void KMSender::doSendMsgAux() // start sending the current message seStatusMsg(i18n("%3: subject of message","Sending message %1 of %2: %3") - .arg(mSentMessages+mFailedMessages+1).arg(mTotalMessages) - .arg(mCurrentMsg->subject())); + .tqarg(mSentMessages+mFailedMessages+1).tqarg(mTotalMessages) + .tqarg(mCurrentMsg->subject())); TQStringList to, cc, bcc; TQString sender; extractSenderToCCAndBcc( mCurrentMsg, &sender, &to, &cc, &bcc ); @@ -696,8 +696,8 @@ void KMSender::slotIdle() "fix the problem (e.g. a broken address) or remove the message " "from the 'outbox' folder.\n" "The following transport protocol was used:\n %2") - .arg(errString) - .arg(mMethodStr); + .tqarg(errString) + .tqarg(mMethodStr); if (!errString.isEmpty()) KMessageBox::error(0,msg); seStatusMsg( i18n( "Sending aborted." ) ); } else { @@ -724,8 +724,8 @@ void KMSender::slotIdle() "from the 'outbox' folder.</p>" "<p>The following transport protocol was used: %2</p>" "<p>Do you want me to continue sending the remaining messages?</p>") - .arg(errString) - .arg(mMethodStr); + .tqarg(errString) + .tqarg(mMethodStr); res = KMessageBox::warningYesNo( 0 , msg , i18n( "Continue Sending" ), i18n( "&Continue Sending" ), i18n("&Abort Sending") ); @@ -735,8 +735,8 @@ void KMSender::slotIdle() "fix the problem (e.g. a broken address) or remove the message " "from the 'outbox' folder.\n" "The following transport protocol was used:\n %2") - .arg(errString) - .arg(mMethodStr); + .tqarg(errString) + .tqarg(mMethodStr); KMessageBox::error(0,msg); } if (res == KMessageBox::Yes) { @@ -850,7 +850,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg) int n = 0; while (1) { ulong msn; - KMMsgStatus status; + KMMsgtqStatus status; aMsg->getLink(n, &msn, &status); if (!msn || !status) break; @@ -867,7 +867,7 @@ void KMSender::seStatusByLink(const KMMessage *aMsg) new KMDeleteMsgCommand( folder, folder->getMsg( index ) ); cmd->start(); } else { - folder->seStatus(index, status); + folder->setqStatus(index, status); } } else { kdWarning(5006) << k_funcinfo << "Cannot update linked message, it could not be found!" << endl; @@ -934,8 +934,8 @@ bool KMSendSendmail::doStart() { "Please remove it from there if you do not want the message to " "be resent.\n" "The following transport protocol was used:\n %2") - .arg(str + "\n") - .arg("sendmail://"); + .tqarg(str + "\n") + .tqarg("sendmail://"); KMessageBox::information(0,msg); return false; } @@ -978,7 +978,7 @@ bool KMSendSendmail::doSend( const TQString & sender, const TQStringList & to, c if ( !mMailerProc->start( KProcess::NotifyOnExit, KProcess::All ) ) { KMessageBox::information( 0, i18n("Failed to execute mailer program %1") - .arg( mSender->transportInfo()->host ) ); + .tqarg( mSender->transportInfo()->host ) ); return false; } mMsgPos = mMsgStr.data(); diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp index 264e4b05d..b5b0680da 100644 --- a/kmail/kmstartup.cpp +++ b/kmail/kmstartup.cpp @@ -43,7 +43,7 @@ #include <unistd.h> #include <tqfile.h> -#undef Status // stupid X headers +#undef tqStatus // stupid X headers extern "C" { @@ -165,7 +165,7 @@ void lockOrDie() { // On linux with /proc we can even check that it's really kmail and not something else char path_buffer[MAXPATHLEN + 1]; path_buffer[MAXPATHLEN] = 0; - const TQString procPath = TQString("/proc/%1/exe").arg(oldPid); + const TQString procPath = TQString("/proc/%1/exe").tqarg(oldPid); const int length = readlink (procPath.latin1(), path_buffer, MAXPATHLEN); if ( length == -1 ) // not such pid first_instance = true; @@ -199,17 +199,17 @@ void lockOrDie() { "this machine. Running %2 more than once " "can cause the loss of mail. You should not start %1 " "unless you are sure that it is not already running.") - .arg( programName, programName ); + .tqarg( programName, programName ); // TQString::arg( st ) only replaces the first occurrence of %1 // with st while TQString::arg( s1, s2 ) replacess all occurrences // of %1 with s1 and all occurrences of %2 with s2. So don't - // even think about changing the above to .arg( programName ). + // even think about changing the above to .tqarg( programName ). else msg = i18n("%1 seems to be running on another display on this " "machine. Running %1 and %2 at the same " "time can cause the loss of mail. You should not start %2 " "unless you are sure that %1 is not running.") - .arg( oldProgramName, programName ); + .tqarg( oldProgramName, programName ); } else { if ( oldAppName == appName ) @@ -217,19 +217,19 @@ void lockOrDie() { "than once can cause the loss of mail. You should not " "start %1 on this computer unless you are sure that it is " "not already running on %2.") - .arg( programName, oldHostName ); + .tqarg( programName, oldHostName ); else msg = i18n("%1 seems to be running on %3. Running %1 and %2 at the " "same time can cause the loss of mail. You should not " "start %2 on this computer unless you are sure that %1 is " "not running on %3.") - .arg( oldProgramName, programName, oldHostName ); + .tqarg( oldProgramName, programName, oldHostName ); } KCursorSaver idle( KBusyPtr::idle() ); if ( KMessageBox::No == KMessageBox::warningYesNo( 0, msg, TQString(), - i18n("Start %1").arg( programName ), + i18n("Start %1").tqarg( programName ), i18n("Exit") ) ) { exit(1); } diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index 3a1ab1ab5..d7bba197b 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -67,7 +67,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) mNewMessagePopupId(-1), mPopupMenu(0) { - setAlignment( AlignCenter ); + tqsetAlignment( AlignCenter ); kdDebug(5006) << "Initting systray" << endl; mLastUpdate = time( 0 ); @@ -81,7 +81,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) KMMainWidget * mainWidget = kmkernel->getKMMainWidget(); if ( mainWidget ) { - TQWidget * mainWin = mainWidget->topLevelWidget(); + TQWidget * mainWin = mainWidget->tqtopLevelWidget(); if ( mainWin ) { mDesktopOfMainWin = KWin::windowInfo( mainWin->winId(), NET::WMDesktop ).desktop(); @@ -133,7 +133,7 @@ void KMSystemTray::buildPopupMenu() action->plug( mPopupMenu ); mPopupMenu->insertSeparator(); - KMainWindow *mainWin = ::tqqt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->topLevelWidget()); + KMainWindow *mainWin = ::tqqt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->tqtopLevelWidget()); mPopupMenu->insertItem( SmallIcon("exit"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) ); } @@ -385,7 +385,7 @@ bool KMSystemTray::mainWindowIsOnCurrentDesktop() if ( !mainWidget ) return false; - TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget(); + TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget(); if ( !mainWin ) return false; @@ -401,7 +401,7 @@ void KMSystemTray::showKMail() { if (!kmkernel->getKMMainWidget()) return; - TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget(); + TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget(); assert(mainWin); if(mainWin) { @@ -429,7 +429,7 @@ void KMSystemTray::hideKMail() { if (!kmkernel->getKMMainWidget()) return; - TQWidget *mainWin = kmkernel->getKMMainWidget()->topLevelWidget(); + TQWidget *mainWin = kmkernel->getKMMainWidget()->tqtopLevelWidget(); assert(mainWin); if(mainWin) { diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index a2afcf3d2..c74c87f89 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <klineedit.h> #include <tqradiobutton.h> #include <tqtabwidget.h> @@ -145,7 +145,7 @@ void KMTransportInfo::writeConfig(int id) "but should not be considered secure from decryption efforts " "if access to the configuration file is obtained.\n" "Do you want to store the password for account '%1' in the " - "configuration file?").arg( name ), + "configuration file?").tqarg( name ), i18n("KWallet Not Available"), KGuiItem( i18n("Store Password") ), KGuiItem( i18n("Do Not Store Password") ) ) @@ -291,7 +291,7 @@ KMTransportDialog::KMTransportDialog( const TQString & caption, { assert(transportInfo != 0); - if( transportInfo->type == TQString::fromLatin1("sendmail") ) + if( transportInfo->type == TQString::tqfromLatin1("sendmail") ) { makeSendmailPage(); } else { diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp index 1d8ac380e..29dd8d8b0 100644 --- a/kmail/listjob.cpp +++ b/kmail/listjob.cpp @@ -44,7 +44,7 @@ using KPIM::ProgressManager; #include <kio/global.h> #include <klocale.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <stdlib.h> @@ -109,16 +109,16 @@ void ListJob::execute() jd.curNamespace = mNamespace; if ( mParentProgressItem ) { - TQString escapedStatus = mDestFolder ? TQStyleSheet::escape( mDestFolder->prettyURL() ) + TQString escapedtqStatus = mDestFolder ? TQStyleSheet::escape( mDestFolder->prettyURL() ) : TQString(); jd.progressItem = ProgressManager::createProgressItem( mParentProgressItem, "ListDir" + ProgressManager::getUniqueID(), - escapedStatus, + escapedtqStatus, i18n("retrieving folders"), false, mAccount->useSSL() || mAccount->useTLS() ); - mParentProgressItem->seStatus( escapedStatus ); + mParentProgressItem->setqStatus( escapedtqStatus ); } // make the URL @@ -174,7 +174,7 @@ void ListJob::slotListResult( KIO::Job* job ) if ( job->error() ) { mAccount->handleJobError( job, - i18n( "Error while listing folder %1: " ).arg((*it).path), + i18n( "Error while listing folder %1: " ).tqarg((*it).path), true ); } else { diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp index 3b6f55dc8..ca5f2cc9a 100644 --- a/kmail/localsubscriptiondialog.cpp +++ b/kmail/localsubscriptiondialog.cpp @@ -72,7 +72,7 @@ void LocalSubscriptionDialog::processFolderListing() uint done = 0; for (uint i = mCount; i < mFolderNames.count(); ++i) { - // give the dialog a chance to repaint + // give the dialog a chance to tqrepaint if (done == 1000) { emit listChanged(); diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 15749d71e..85c0c3408 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -25,7 +25,7 @@ ** you do not wish to do so, delete this exception statement from ** your version. *******************************************************************************/ -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqgroupbox.h> @@ -55,12 +55,12 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* TQLabel* label; mLastItem = 0; - TQVBoxLayout *topLayout = new TQVBoxLayout( layout(), spacingHint(), + TQVBoxLayout *topLayout = new TQVBoxLayout( tqlayout(), spacingHint(), "topLayout" ); TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this ); mlGroup->setColumnLayout( 0, Qt::Vertical ); - TQGridLayout *groupLayout = new TQGridLayout( mlGroup->layout(), 6, 3, spacingHint() ); + TQGridLayout *groupLayout = new TQGridLayout( mlGroup->tqlayout(), 6, 3, spacingHint() ); topLayout->addWidget( mlGroup ); setMainWidget( mlGroup ); @@ -144,7 +144,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* TQT_SLOT(slotAddressChanged(int)) ); load(); - resize( TQSize(295, 204).expandedTo(minimumSizeHint()) ); + resize( TQSize(295, 204).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kmail/main.cpp b/kmail/main.cpp index ae2d5a06f..0cca3cb20 100644 --- a/kmail/main.cpp +++ b/kmail/main.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> -#undef Status // stupid X headers +#undef tqStatus // stupid X headers #include "aboutdata.h" diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index ab8675050..b65acadf8 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -15,9 +15,9 @@ #include <kglobalsettings.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlistview.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqpopupmenu.h> #include <cassert> @@ -54,7 +54,7 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); vlay->addWidget( mListView ); - resize( 2 * sizeHint().width(), sizeHint().height() ); + resize( 2 * tqsizeHint().width(), tqsizeHint().height() ); slotRefresh(); } @@ -253,7 +253,7 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() { u.setFileName( mContextMenuItem->text( 0 ) ); - if ( KMessageBox::warningContinueCancel( this, i18n( "Really delete script \"%1\" from the server?" ).arg( u.fileName() ), + if ( KMessageBox::warningContinueCancel( this, i18n( "Really delete script \"%1\" from the server?" ).tqarg( u.fileName() ), i18n( "Delete Sieve Script Confirmation" ), KStdGuiItem::del() ) != KMessageBox::Continue ) @@ -322,7 +322,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name ) mTextEdit->setWordWrap( TQTextEdit::NoWrap ); mTextEdit->setFont( KGlobalSettings::fixedFont() ); connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) ); - resize( 3 * sizeHint() ); + resize( 3 * tqsizeHint() ); } KMail::SieveEditor::~SieveEditor() {} diff --git a/kmail/managesievescriptsdialog_p.h b/kmail/managesievescriptsdialog_p.h index fb19f0f9d..f860ffb52 100644 --- a/kmail/managesievescriptsdialog_p.h +++ b/kmail/managesievescriptsdialog_p.h @@ -3,7 +3,7 @@ #include <kdialogbase.h> -#include <textedit.h> +#include <tqtextedit.h> namespace KMail { diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index c1f569925..6dc248e7b 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -223,30 +223,30 @@ void MessageActions::slotNoQuoteReplyToMsg() void MessageActions::slotSetMsgStatusNew() { - setMessageStatus( KMMsgStatusNew ); + setMessagetqStatus( KMMsgStatusNew ); } void MessageActions::slotSetMsgStatusUnread() { - setMessageStatus( KMMsgStatusUnread ); + setMessagetqStatus( KMMsgStatusUnread ); } void MessageActions::slotSetMsgStatusRead() { - setMessageStatus( KMMsgStatusRead ); + setMessagetqStatus( KMMsgStatusRead ); } void MessageActions::slotSetMsgStatusFlag() { - setMessageStatus( KMMsgStatusFlag, true ); + setMessagetqStatus( KMMsgStatusFlag, true ); } void MessageActions::slotSetMsgStatusTodo() { - setMessageStatus( KMMsgStatusTodo, true ); + setMessagetqStatus( KMMsgStatusTodo, true ); } -void MessageActions::setMessageStatus( KMMsgStatus status, bool toggle ) +void MessageActions::setMessagetqStatus( KMMsgtqStatus status, bool toggle ) { TQValueList<TQ_UINT32> serNums = mVisibleSernums; if ( serNums.isEmpty() && mCurrentMessage ) diff --git a/kmail/messageactions.h b/kmail/messageactions.h index f0b47372d..a99e555b7 100644 --- a/kmail/messageactions.h +++ b/kmail/messageactions.h @@ -70,7 +70,7 @@ class MessageActions : public TQObject private: void updateActions(); template<typename T> void replyCommand(); - void setMessageStatus( KMMsgStatus status, bool toggle = false ); + void setMessagetqStatus( KMMsgtqStatus status, bool toggle = false ); private slots: void slotReplyToMsg(); diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index dadc653f4..c69aa525b 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -75,8 +75,8 @@ #include <kdebug.h> #include <kaction.h> #include <tqfile.h> -#include <textcodec.h> -#include <textedit.h> +#include <tqtextcodec.h> +#include <tqtextedit.h> #include <tqtimer.h> #include <gpgmepp/key.h> @@ -599,7 +599,7 @@ void MessageComposer::chiasmusEncryptAllAttachments() { for ( TQValueVector<Attachment>::iterator it = mAttachments.begin(), end = mAttachments.end() ; it != end ; ++it ) { KMMessagePart * part = it->part; const TQString filename = part->fileName(); - if ( filename.endsWith( ".xia", false ) ) + if ( filename.tqendsWith( ".xia", false ) ) continue; // already encrypted const TQByteArray body = part->bodyDecodedBinary(); TQByteArray resultData; @@ -2038,7 +2038,7 @@ bool MessageComposer::processStructuringInfo( const TQString bugURL, i18n( "<qt><p>Error: The backend did not return " "any encoded data.</p>" "<p>Please report this bug:<br>%2</p></qt>" ) - .arg( bugURL ) ); + .tqarg( bugURL ) ); bOk = false; } resultingPart.setBodyEncodedBinary( resultingBody ); @@ -2092,7 +2092,7 @@ TQByteArray MessageComposer::breakLinesAndApplyCodec() if( mCharset == "us-ascii" ) { cText = KMMsgBase::toUsAscii( text ); - newText = TQString::fromLatin1( cText ); + newText = TQString::tqfromLatin1( cText ); } else if( codec == 0 ) { kdDebug(5006) << "Something is wrong and I can not get a codec." << endl; cText = text.local8Bit(); diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp index 145ab2b2d..23ebea559 100644 --- a/kmail/networkaccount.cpp +++ b/kmail/networkaccount.cpp @@ -224,7 +224,7 @@ namespace KMail { "but should not be considered secure from decryption efforts " "if access to the configuration file is obtained.\n" "Do you want to store the password for account '%1' in the " - "configuration file?").arg( name() ), + "configuration file?").tqarg( name() ), i18n("KWallet Not Available"), KGuiItem( i18n("Store Password") ), KGuiItem( i18n("Do Not Store Password") ) ) diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp index 13e2c6b72..e6fed27be 100644 --- a/kmail/newfolderdialog.cpp +++ b/kmail/newfolderdialog.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <tqlineedit.h> #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqregexp.h> @@ -66,7 +66,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder ) { setWFlags( getWFlags() | WDestructiveClose ); if ( mFolder ) { - setCaption( i18n("New Subfolder of %1").arg( mFolder->prettyURL() ) ); + setCaption( i18n("New Subfolder of %1").tqarg( mFolder->prettyURL() ) ); } TQWidget* privateLayoutWidget = new TQWidget( this, "mTopLevelLayout" ); privateLayoutWidget->setGeometry( TQRect( 10, 10, 260, 80 ) ); @@ -176,7 +176,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder ) } } - resize( TQSize(282, 108).expandedTo(minimumSizeHint()) ); + resize( TQSize(282, 108).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); slotFolderNameChanged( mNameLineEdit->text()); } @@ -213,14 +213,14 @@ void NewFolderDialog::slotOk() && ( selectedFolderDir == mFolder->parent() ) && ( mFolder->storage()->name() == fldName ) ) ) ) { - const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).arg(fldName); + const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>" ).tqarg(fldName); KMessageBox::error( this, message ); return; } /* Ok, obvious errors caught, let's try creating it for real. */ const TQString message = i18n( "<qt>Failed to create folder <b>%1</b>." - "</qt> " ).arg(fldName); + "</qt> " ).tqarg(fldName); TQString namespaceName; if ( mNamespacesComboBox ) { diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 0b827cc79..0e5103e29 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -98,7 +98,7 @@ #include <kmdcodec.h> // other TQt headers -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqdir.h> #include <tqfile.h> #include <tqapplication.h> @@ -272,7 +272,7 @@ namespace KMail { ProcessResult processResult; if ( mReader ) { - htmlWriter()->queue( TQString::fromLatin1("<a name=\"att%1\"/>").arg( node->nodeId() ) ); + htmlWriter()->queue( TQString::tqfromLatin1("<a name=\"att%1\"/>").tqarg( node->nodeId() ) ); } if ( const Interface::BodyPartFormatter * formatter @@ -391,7 +391,7 @@ namespace KMail { ////////////////// ////////////////// - static int signatureToStatus( const GpgME::Signature &sig ) + static int signatureTotqStatus( const GpgME::Signature &sig ) { switch ( sig.status().code() ) { case GPG_ERR_NO_ERROR: @@ -586,10 +586,10 @@ namespace KMail { //kdDebug(5006) << "\nObjectTreeParser::writeOpaqueOrMultipartSignedData: found signature" << endl; GpgME::Signature signature = signatures[0]; - messagePart.status_code = signatureToStatus( signature ); + messagePart.status_code = signatureTotqStatus( signature ); messagePart.status = TQString::fromUtf8( signature.status().asString() ); for ( uint i = 1; i < signatures.size(); ++i ) { - if ( signatureToStatus( signatures[i] ) != messagePart.status_code ) { + if ( signatureTotqStatus( signatures[i] ) != messagePart.status_code ) { messagePart.status_code = GPGME_SIG_STAT_DIFF; messagePart.status = i18n("Different results for signatures"); } @@ -686,11 +686,11 @@ namespace KMail { switch ( cryptPlugError ) { case NOT_INITIALIZED: errorMsg = i18n( "Crypto plug-in \"%1\" is not initialized." ) - .arg( cryptPlugLibName ); + .tqarg( cryptPlugLibName ); break; case CANT_VERIFY_SIGNATURES: errorMsg = i18n( "Crypto plug-in \"%1\" cannot verify signatures." ) - .arg( cryptPlugLibName ); + .tqarg( cryptPlugLibName ); break; case NO_PLUGIN: if ( cryptPlugDisplayName.isEmpty() ) @@ -698,14 +698,14 @@ namespace KMail { else errorMsg = i18n( "%1 is either 'OpenPGP' or 'S/MIME'", "No %1 plug-in was found." ) - .arg( cryptPlugDisplayName ); + .tqarg( cryptPlugDisplayName ); break; } messagePart.errorText = i18n( "The message is signed, but the " "validity of the signature cannot be " "verified.<br />" "Reason: %1" ) - .arg( errorMsg ); + .tqarg( errorMsg ); } if ( mReader ) @@ -887,9 +887,9 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, + "</div>"; if ( !passphraseError ) aErrorText = i18n("Crypto plug-in \"%1\" could not decrypt the data.") - .arg( cryptPlugLibName ) + .tqarg( cryptPlugLibName ) + "<br />" - + i18n("Error: %1").arg( aErrorText ); + + i18n("Error: %1").tqarg( aErrorText ); } } } @@ -901,11 +901,11 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, switch ( cryptPlugError ) { case NOT_INITIALIZED: aErrorText = i18n( "Crypto plug-in \"%1\" is not initialized." ) - .arg( cryptPlugLibName ); + .tqarg( cryptPlugLibName ); break; case CANT_DECRYPT: aErrorText = i18n( "Crypto plug-in \"%1\" cannot decrypt messages." ) - .arg( cryptPlugLibName ); + .tqarg( cryptPlugLibName ); break; case NO_PLUGIN: aErrorText = i18n( "No appropriate crypto plug-in was found." ); @@ -1656,7 +1656,7 @@ namespace KMail { const GpgME::ImportResult res = import->exec( certData ); if ( res.error() ) { htmlWriter()->queue( i18n( "Sorry, certificate could not be imported.<br>" - "Reason: %1").arg( TQString::fromLocal8Bit( res.error().asString() ) ) ); + "Reason: %1").tqarg( TQString::fromLocal8Bit( res.error().asString() ) ) ); return true; } @@ -1696,14 +1696,14 @@ namespace KMail { for ( std::vector<GpgME::Import>::const_iterator it = imports.begin() ; it != imports.end() ; ++it ) { if ( (*it).error() ) htmlWriter()->queue( i18n( "Failed: %1 (%2)" ) - .arg( (*it).fingerprint(), + .tqarg( (*it).fingerprint(), TQString::fromLocal8Bit( (*it).error().asString() ) ) ); else if ( (*it).status() & ~GpgME::Import::ContainedSecretKey ) { if ( (*it).status() & GpgME::Import::ContainedSecretKey ) { - htmlWriter()->queue( i18n( "New or changed: %1 (secret key available)" ).arg( (*it).fingerprint() ) ); + htmlWriter()->queue( i18n( "New or changed: %1 (secret key available)" ).tqarg( (*it).fingerprint() ) ); } else { - htmlWriter()->queue( i18n( "New or changed: %1" ).arg( (*it).fingerprint() ) ); + htmlWriter()->queue( i18n( "New or changed: %1" ).tqarg( (*it).fingerprint() ) ); } } htmlWriter()->queue( "<br>" ); @@ -2054,7 +2054,7 @@ bool ObjectTreeParser::processApplicationMsTnefSubtype( partNode *node, ProcessR TQString fileName = mReader->writeMessagePartToTempFile( msgPart, partNum ); - TQString href = TQString( "attachment:%1?place=body" ).arg( partNum ); + TQString href = TQString( "attachment:%1?place=body" ).tqarg( partNum ); TQString iconName; if( inlineImage ) @@ -2280,7 +2280,7 @@ static TQString writeSimpleSigstatHeader( const PartMetaData &block ) if ( addr.isEmpty() ) { html += i18n( "Signature is valid." ); } else { - html += i18n( "Signed by <a href=\"mailto:%1\">%2</a>." ).arg( addr, name ); + html += i18n( "Signed by <a href=\"mailto:%1\">%2</a>." ).tqarg( addr, name ); } } else { // should not happen @@ -2307,7 +2307,7 @@ static TQString makeShowAuditLogLink( const GpgME::Error & err, const TQString & //kdDebug(5006) << "makeShowAuditLogLink: not showing link (not available)" << endl; return i18n("No Audit Log available"); } else { - return i18n("Error Retrieving Audit Log: %1").arg( TQString::fromLocal8Bit( err.asString() ) ); + return i18n("Error Retrieving Audit Log: %1").tqarg( TQString::fromLocal8Bit( err.asString() ) ); } } @@ -2371,7 +2371,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, else { htmlStr += i18n("Encrypted message (decryption not possible)"); if( !block.errorText.isEmpty() ) - htmlStr += "<br />" + i18n("Reason: %1").arg( block.errorText ); + htmlStr += "<br />" + i18n("Reason: %1").tqarg( block.errorText ); } htmlStr += "</td></tr><tr class=\"encrB\"><td>"; } @@ -2428,13 +2428,13 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, if( isSMIME ) startKeyHREF = TQString("<a href=\"kmail:showCertificate#%1 ### %2 ### %3\">") - .arg( cryptProto->displayName(), + .tqarg( cryptProto->displayName(), cryptProto->name(), block.keyId ); TQString keyWithWithoutURL = isSMIME ? TQString("%1%2</a>") - .arg( startKeyHREF, + .tqarg( startKeyHREF, cannotCheckSignature ? i18n("[Details]") : ("0x" + block.keyId) ) : "0x" + TQString::fromUtf8( block.keyId ); @@ -2486,7 +2486,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, i18n("Warning:") + "</u> " + i18n("Sender's mail address is not stored " - "in the %1 used for signing.").arg(certificate) + + "in the %1 used for signing.").tqarg(certificate) + "<br />" + i18n("sender: ") + msgFrom + @@ -2512,7 +2512,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, "</u> " + i18n("No mail address is stored in the %1 used for signing, " "so we cannot compare it to the sender's address %2.") - .arg(certificate,msgFrom); + .tqarg(certificate,msgFrom); } if( !greenCaseWarning.isEmpty() ) { if( !statusStr.isEmpty() ) @@ -2535,7 +2535,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, if( cannotCheckSignature ) { htmlStr += i18n( "Not enough information to check " "signature. %1" ) - .arg( keyWithWithoutURL ); + .tqarg( keyWithWithoutURL ); } else { @@ -2553,26 +2553,26 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, htmlStr += i18n( "Message was signed with unknown key." ); else htmlStr += i18n( "Message was signed by %1." ) - .arg( signer ); + .tqarg( signer ); } else { TQDateTime created = block.creationTime; if( created.isValid() ) { if( signer.isEmpty() ) { if( onlyShowKeyURL ) htmlStr += i18n( "Message was signed with key %1." ) - .arg( keyWithWithoutURL ); + .tqarg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed on %1 with key %2." ) - .arg( KGlobal::locale()->formatDateTime( created ), + .tqarg( KGlobal::locale()->formatDateTime( created ), keyWithWithoutURL ); } else { if( onlyShowKeyURL ) htmlStr += i18n( "Message was signed with key %1." ) - .arg( keyWithWithoutURL ); + .tqarg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed by %3 on %1 with key %2" ) - .arg( KGlobal::locale()->formatDateTime( created ), + .tqarg( KGlobal::locale()->formatDateTime( created ), keyWithWithoutURL, signer ); } @@ -2580,10 +2580,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, else { if( signer.isEmpty() || onlyShowKeyURL ) htmlStr += i18n( "Message was signed with key %1." ) - .arg( keyWithWithoutURL ); + .tqarg( keyWithWithoutURL ); else htmlStr += i18n( "Message was signed by %2 with key %1." ) - .arg( keyWithWithoutURL, + .tqarg( keyWithWithoutURL, signer ); } } @@ -2621,11 +2621,11 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, TQDateTime created = block.creationTime; if ( created.isValid() ) htmlStr += i18n( "Message was signed on %1 with unknown key %2." ) - .arg( KGlobal::locale()->formatDateTime( created ), + .tqarg( KGlobal::locale()->formatDateTime( created ), keyWithWithoutURL ); else htmlStr += i18n( "Message was signed with unknown key %1." ) - .arg( keyWithWithoutURL ); + .tqarg( keyWithWithoutURL ); } else htmlStr += i18n( "Message was signed with unknown key." ); @@ -2663,10 +2663,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, simpleHtmlStr += writeSimpleSigstatHeader( block ); if( !block.keyId.isEmpty() ) htmlStr += i18n( "Message was signed by %2 (Key ID: %1)." ) - .arg( keyWithWithoutURL, + .tqarg( keyWithWithoutURL, signer ); else - htmlStr += i18n( "Message was signed by %1." ).arg( signer ); + htmlStr += i18n( "Message was signed by %1." ).tqarg( signer ); htmlStr += "<br />"; switch( block.keyTrust ) @@ -2707,10 +2707,10 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, simpleHtmlStr += writeSimpleSigstatHeader( block ); if( !block.keyId.isEmpty() ) htmlStr += i18n( "Message was signed by %2 (Key ID: %1)." ) - .arg( keyWithWithoutURL, + .tqarg( keyWithWithoutURL, signer ); else - htmlStr += i18n( "Message was signed by %1." ).arg( signer ); + htmlStr += i18n( "Message was signed by %1." ).tqarg( signer ); htmlStr += "<br />"; htmlStr += i18n("Warning: The signature is bad."); frame = "</td></tr>" @@ -2763,7 +2763,7 @@ void ObjectTreeParser::writeAttachmentMarkHeader( partNode *node ) if ( !mReader ) return; - htmlWriter()->queue( TQString( "<div id=\"attachmentDiv%1\">\n" ).arg( node->nodeId() ) ); + htmlWriter()->queue( TQString( "<div id=\"attachmentDiv%1\">\n" ).tqarg( node->nodeId() ) ); } //----------------------------------------------------------------------------- @@ -2798,7 +2798,7 @@ void ObjectTreeParser::writeBodyStr( const TQCString& aStr, const TQTextCodec *a bool isPgpMessage = false; // true if the message contains at least one // PGP MESSAGE or one PGP SIGNED MESSAGE block TQString dir = ( TQApplication::reverseLayout() ? "rtl" : "ltr" ); - TQString headerStr = TQString("<div dir=\"%1\">").arg(dir); + TQString headerStr = TQString("<div dir=\"%1\">").tqarg(dir); inlineSignatureState = KMMsgNotSigned; inlineEncryptionState = KMMsgNotEncrypted; @@ -2970,7 +2970,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) const unsigned int length = s.length(); // skip leading empty lines - for ( pos = 0; pos < length && s.at(pos) <= TQChar(' '); pos++ ) { ; } + for ( pos = 0; pos < length && s.tqat(pos) <= TQChar(' '); pos++ ) { ; } while (pos > 0 && (s[pos-1] == ' ' || s[pos-1] == '\t')) pos--; beg = pos; @@ -3051,8 +3051,8 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) htmlStr += "<div class=\"quotelevelmark\" >" ; htmlStr += TQString( "<a href=\"kmail:levelquote?%1 \">" "<img src=\"%2\" alt=\"\" title=\"\"/></a>" ) - .arg(-1) - .arg( mExpandIcon ); + .tqarg(-1) + .tqarg( mExpandIcon ); htmlStr += "</div><br/>"; htmlStr += quoteEnd; } @@ -3060,8 +3060,8 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) htmlStr += "<div class=\"quotelevelmark\" >" ; htmlStr += TQString( "<a href=\"kmail:levelquote?%1 \">" "<img src=\"%2\" alt=\"\" title=\"\"/></a>" ) - .arg(actQuoteLevel) - .arg( mCollapseIcon); + .tqarg(actQuoteLevel) + .tqarg( mCollapseIcon); htmlStr += "</div>"; if ( actQuoteLevel < 3 ) htmlStr += quoteFontTag[actQuoteLevel]; @@ -3085,7 +3085,7 @@ TQString ObjectTreeParser::quotedHTML( const TQString& s, bool decorate ) // ignore ^M DOS linebreaks if( !line.replace('\015', "").isEmpty() ) { - htmlStr +=TQString( "<div dir=\"%1\">" ).arg( line.isRightToLeft() ? "rtl":"ltr" ); + htmlStr +=TQString( "<div dir=\"%1\">" ).tqarg( line.isRightToLeft() ? "rtl":"ltr" ); htmlStr += LinkLocator::convertToHtml( line, convertFlags ); htmlStr += TQString( "</div>" ); } diff --git a/kmail/objecttreeparser.h b/kmail/objecttreeparser.h index f9e71427a..b864ea618 100644 --- a/kmail/objecttreeparser.h +++ b/kmail/objecttreeparser.h @@ -169,13 +169,13 @@ namespace KMail { KMail::CSSHelper * cssHelper() const { return mCSSHelper; } /** Parse beginning at a given node and recursively parsing - the children of that node and it's next sibling. */ + the tqchildren of that node and it's next sibling. */ // Function is called internally by "parseMsg(KMMessage* msg)" // and it will be replaced once KMime is alive. void parseObjectTree( partNode * node ); private: - /** Standard children handling a.k.a. multipart/mixed (w/o + /** Standard tqchildren handling a.k.a. multipart/mixed (w/o kroupware hacks) */ void stdChildHandling( partNode * child ); diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp index a645b3989..947c76ae3 100644 --- a/kmail/objecttreeparser_p.cpp +++ b/kmail/objecttreeparser_p.cpp @@ -190,7 +190,7 @@ bool VerifyDetachedBodyPartMemento::canStartKeyListJob() const TQStringList VerifyDetachedBodyPartMemento::keyListPattern() const { assert( canStartKeyListJob() ); - return TQStringList( TQString::fromLatin1( m_vr.signature( 0 ).fingerprint() ) ); + return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) ); } void VerifyDetachedBodyPartMemento::saveResult( const VerificationResult & vr ) @@ -297,7 +297,7 @@ bool VerifyOpaqueBodyPartMemento::canStartKeyListJob() const TQStringList VerifyOpaqueBodyPartMemento::keyListPattern() const { assert( canStartKeyListJob() ); - return TQStringList( TQString::fromLatin1( m_vr.signature( 0 ).fingerprint() ) ); + return TQStringList( TQString::tqfromLatin1( m_vr.signature( 0 ).fingerprint() ) ); } void VerifyOpaqueBodyPartMemento::saveResult( const VerificationResult & vr, diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp index 705a0e2cc..333d14b0d 100644 --- a/kmail/partNode.cpp +++ b/kmail/partNode.cpp @@ -209,7 +209,7 @@ void partNode::buildObjectTree( bool processSiblings ) && curNode->dwPart()->Next() ) ) { curNode = curNode->mRoot; } - // we might have to leave when all children have been processed + // we might have to leave when all tqchildren have been processed if( this == curNode && !processSiblings ) return; // store next node @@ -269,7 +269,7 @@ TQString partNode::contentTypeParameter( const char * name ) const { DwString this_attr = param->Attribute(); this_attr.ConvertToLowerCase(); // what a braindead design! if ( this_attr == attr ) - return TQString::fromLatin1( param->Value().data(), param->Value().size() ); + return TQString::tqfromLatin1( param->Value().data(), param->Value().size() ); // warning: misses rfc2231 handling! } return TQString(); @@ -279,7 +279,7 @@ KMMsgEncryptionState partNode::overallEncryptionState() const { KMMsgEncryptionState myState = KMMsgEncryptionStateUnknown; if( mEncryptionState == KMMsgNotEncrypted ) { - // NOTE: children are tested ONLY when parent is not encrypted + // NOTE: tqchildren are tested ONLY when parent is not encrypted if( mChild ) myState = mChild->overallEncryptionState(); else @@ -320,7 +320,7 @@ KMMsgSignatureState partNode::overallSignatureState() const { KMMsgSignatureState myState = KMMsgSignatureStateUnknown; if( mSignatureState == KMMsgNotSigned ) { - // children are tested ONLY when parent is not signed + // tqchildren are tested ONLY when parent is not signed if( mChild ) myState = mChild->overallSignatureState(); else @@ -746,7 +746,7 @@ void partNode::setDisplayedHidden( bool displayedHidden ) TQString partNode::asHREF( const TQString &place ) const { - return TQString( "attachment:%1?place=%2" ).arg( nodeId() ).arg( place ); + return TQString( "attachment:%1?place=%2" ).tqarg( nodeId() ).tqarg( place ); } partNode::AttachmentDisplayInfo partNode::attachmentDisplayInfo() const diff --git a/kmail/partNode.h b/kmail/partNode.h index 242223a31..a043e1403 100644 --- a/kmail/partNode.h +++ b/kmail/partNode.h @@ -150,10 +150,10 @@ public: return mEncryptionState; } - // look at the encryption states of all children and return result + // look at the encryption states of all tqchildren and return result KMMsgEncryptionState overallEncryptionState() const ; - // look at the signature states of all children and return result + // look at the signature states of all tqchildren and return result KMMsgSignatureState overallSignatureState() const ; void setSignatureState( KMMsgSignatureState state ) { diff --git a/kmail/partnodebodypart.cpp b/kmail/partnodebodypart.cpp index 45ce28620..d7e6c95d0 100644 --- a/kmail/partnodebodypart.cpp +++ b/kmail/partnodebodypart.cpp @@ -49,8 +49,8 @@ TQString KMail::PartNodeBodyPart::makeLink( const TQString & path ) const { static const int utf8 = 106; // FIXME: use a PRNG for the first arg, instead of a serial number return TQString( "x-kmail:/bodypart/%1/%2/%3" ) - .arg( serial++ ).arg( mPartNode.nodeId() ) - .arg( KURL::encode_string_no_slash( path, utf8 ) ); + .tqarg( serial++ ).tqarg( mPartNode.nodeId() ) + .tqarg( KURL::encode_string_no_slash( path, utf8 ) ); } TQString KMail::PartNodeBodyPart::asText() const { diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index 2fcf3597f..a37bc6d58 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -47,7 +47,7 @@ using KPIM::BroadcastStatus; #include <kconfig.h> using KIO::MetaData; -#include <stylesheet.h> +#include <tqstylesheet.h> static const unsigned short int pop3DefaultPort = 110; @@ -167,7 +167,7 @@ void PopAccount::processNewMail(bool _interactive) } TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" + - mHost + ":" + TQString("%1").arg(mPort) ); + mHost + ":" + TQString("%1").tqarg(mPort) ); KConfig config( seenUidList ); TQStringList uidsOfSeenMsgs = config.readListEntry( "seenUidList" ); TQValueList<int> timeOfSeenMsgs = config.readIntListEntry( "seenUidTimeList" ); @@ -370,7 +370,7 @@ void PopAccount::startJob() if (!runPrecommand(precommand())) { KMessageBox::sorry(0, - i18n("Could not execute precommand: %1").arg(precommand()), + i18n("Could not execute precommand: %1").tqarg(precommand()), i18n("KMail Error Message")); checkDone( false, CheckError ); return; @@ -401,7 +401,7 @@ void PopAccount::startJob() mMailCheckProgressItem = KPIM::ProgressManager::createProgressItem( "MailCheck" + mName, escapedName, - i18n("Preparing transmission from \"%1\"...").arg( escapedName ), + i18n("Preparing transmission from \"%1\"...").tqarg( escapedName ), true, // can be canceled useSSL() || useTLS() ); connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), @@ -496,7 +496,7 @@ void PopAccount::slotJobFinished() { "the UIDL command: this command is required to determine, in a reliable way, " "which of the mails on the server KMail has already seen before;\n" "the feature to leave the mails on the server will therefore not " - "work properly.").arg(NetworkAccount::name()) ); + "work properly.").tqarg(NetworkAccount::name()) ); // An attempt to work around buggy pop servers, these seem to be popular. mUidsOfNextSeenMsgsDict = mUidsOfSeenMsgsDict; } @@ -747,21 +747,21 @@ void PopAccount::slotJobFinished() { if ( !idsOfMsgsToDelete.isEmpty() ) { stage = Dele; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from %1. Deleting messages from server...", "Fetched %n messages from %1. Deleting messages from server...", numMsgs ) - .arg( mHost ) ); + .tqarg( mHost ) ); url.setPath("/remove/" + idsOfMsgsToDelete.join(",")); kdDebug(5006) << "url: " << url.prettyURL() << endl; } else { stage = Quit; if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from %1. Terminating transmission...", "Fetched %n messages from %1. Terminating transmission...", numMsgs ) - .arg( mHost ) ); + .tqarg( mHost ) ); url.setPath(TQString("/commit")); kdDebug(5006) << "url: " << url.prettyURL() << endl; } @@ -777,11 +777,11 @@ void PopAccount::slotJobFinished() { } idsOfMsgsToDelete.clear(); if ( mMailCheckProgressItem ) - mMailCheckProgressItem->seStatus( + mMailCheckProgressItem->setqStatus( i18n( "Fetched 1 message from %1. Terminating transmission...", "Fetched %n messages from %1. Terminating transmission...", numMsgs ) - .arg( mHost ) ); + .tqarg( mHost ) ); KURL url = getUrl(); url.setPath(TQString("/commit")); job = KIO::get( url, false, false ); @@ -841,7 +841,7 @@ void PopAccount::saveUidList() seenUidTimeList.append( mTimeOfNextSeenMsgsMap[it.currentKey()] ); } TQString seenUidList = locateLocal( "data", "kmail/" + mLogin + ":" + "@" + - mHost + ":" + TQString("%1").arg(mPort) ); + mHost + ":" + TQString("%1").tqarg(mPort) ); KConfig config( seenUidList ); config.writeEntry( "seenUidList", uidsOfNextSeenMsgs ); config.writeEntry( "seenUidTimeList", seenUidTimeList ); @@ -867,7 +867,7 @@ void PopAccount::slotGetNextMsg() curMsgStrm = new TQDataStream( curMsgData, IO_WriteOnly ); curMsgLen = nextLen; ++indexOfCurrentMsg; - kdDebug(5006) << TQString("Length of message about to get %1").arg( nextLen ) << endl; + kdDebug(5006) << TQString("Length of message about to get %1").tqarg( nextLen ) << endl; mMsgsPendingDownload.remove( next.key() ); } } @@ -904,16 +904,16 @@ void PopAccount::slotData( KIO::Job* job, const TQByteArray &data) { msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 " "(%7 KB remain on the server).") - .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024) - .arg(numBytesToRead/1024).arg(mLogin).arg(mHost).arg(numBytes/1024); + .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024) + .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost).tqarg(numBytes/1024); } else { msg = i18n("Fetching message %1 of %2 (%3 of %4 KB) for %5@%6.") - .arg(indexOfCurrentMsg+1).arg(numMsgs).arg(numBytesRead/1024) - .arg(numBytesToRead/1024).arg(mLogin).arg(mHost); + .tqarg(indexOfCurrentMsg+1).tqarg(numMsgs).tqarg(numBytesRead/1024) + .tqarg(numBytesToRead/1024).tqarg(mLogin).tqarg(mHost); } - mMailCheckProgressItem->seStatus( msg ); + mMailCheckProgressItem->setqStatus( msg ); mMailCheckProgressItem->setProgress( (numBytesToRead <= 100) ? 50 // We never know what the server tells us // This way of dividing is required for > 21MB of mail diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h index e53a4f18e..58b2af575 100644 --- a/kmail/quotajobs.h +++ b/kmail/quotajobs.h @@ -73,8 +73,8 @@ class QuotaInfo { if ( isValid() && !isEmpty() ) { readConfig(); int factor = static_cast<int> ( pow( 1000, mFactor ) ); - return i18n("%1 of %2 %3 used").arg( mCurrent.toInt() / factor ) - .arg( mMax.toInt() / factor ).arg( mUnits ); + return i18n("%1 of %2 %3 used").tqarg( mCurrent.toInt() / factor ) + .tqarg( mMax.toInt() / factor ).tqarg( mUnits ); } return TQString(); } diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 2a21d7f05..5b18e044b 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -39,14 +39,14 @@ #include <kiconloader.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqscrollview.h> #include <tqcombobox.h> #include <tqhbox.h> #include <tqtimer.h> #include <tqpushbutton.h> -#include <stylesheet.h> +#include <tqstylesheet.h> Recipient::Recipient( const TQString &email, Recipient::Type type ) : mEmail( email ), mType( type ) @@ -288,7 +288,7 @@ void RecipientLine::keyPressEvent( TQKeyEvent *ev ) int RecipientLine::setComboWidth( int w ) { - w = TQMAX( w, mCombo->sizeHint().width() ); + w = TQMAX( w, mCombo->tqsizeHint().width() ); mCombo->setFixedWidth( w ); mCombo->updateGeometry(); parentWidget()->updateGeometry(); @@ -331,7 +331,7 @@ RecipientsView::RecipientsView( TQWidget *parent ) addLine(); setResizePolicy( TQScrollView::Manual ); - setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); viewport()->setPaletteBackgroundColor( paletteBackgroundColor() ); } @@ -400,7 +400,7 @@ RecipientLine *RecipientsView::addLine() mFirstColumnWidth = line->setComboWidth( mFirstColumnWidth ); - mLineHeight = line->minimumSizeHint().height(); + mLineHeight = line->tqminimumSizeHint().height(); line->resize( viewport()->width(), mLineHeight ); @@ -536,7 +536,7 @@ void RecipientsView::resizeView() // setFixedHeight( mLineHeight * mLines.count() ); } - parentWidget()->layout()->activate(); + parentWidget()->tqlayout()->activate(); emit sizeHintChanged(); TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) ); } @@ -555,12 +555,12 @@ void RecipientsView::viewportResizeEvent ( TQResizeEvent *ev ) ensureVisible( 0, mLines.count() * mLineHeight ); } -TQSize RecipientsView::sizeHint() const +TQSize RecipientsView::tqsizeHint() const { return TQSize( 200, mLineHeight * mLines.count() ); } -TQSize RecipientsView::minimumSizeHint() const +TQSize RecipientsView::tqminimumSizeHint() const { int height; uint numLines = 5; @@ -742,9 +742,9 @@ void RecipientsToolTip::maybeTip( const TQPoint & p ) text.append( "</qt>" ); - TQRect geometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) ); + TQRect tqgeometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) ); - tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, geometry ); + tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, tqgeometry ); } @@ -757,7 +757,7 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent ) topLayout->addStretch( 1 ); mTotalLabel = new TQLabel( this ); - mTotalLabel->setAlignment( AlignCenter ); + mTotalLabel->tqsetAlignment( AlignCenter ); topLayout->addWidget( mTotalLabel ); mTotalLabel->hide(); @@ -915,8 +915,8 @@ void RecipientsEditor::setRecipientString( const TQString &str, if ( count++ > GlobalSettings::self()->maximumRecipients() ) { KMessageBox::sorry( this, i18n("Truncating recipients list to %1 of %2 entries.") - .arg( GlobalSettings::self()->maximumRecipients() ) - .arg( r.count() ) ); + .tqarg( GlobalSettings::self()->maximumRecipients() ) + .tqarg( r.count() ) ); break; } addRecipient( *it, type ); diff --git a/kmail/recipientseditor.h b/kmail/recipientseditor.h index db63c8fe6..0c4aafbcf 100644 --- a/kmail/recipientseditor.h +++ b/kmail/recipientseditor.h @@ -177,8 +177,8 @@ class RecipientsView : public TQScrollView public: RecipientsView( TQWidget *parent ); - TQSize minimumSizeHint() const; - TQSize sizeHint() const; + TQSize tqminimumSizeHint() const; + TQSize tqsizeHint() const; RecipientLine *activeLine(); diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp index c7be8da3b..05e552530 100644 --- a/kmail/recipientseditortest.cpp +++ b/kmail/recipientseditortest.cpp @@ -34,10 +34,10 @@ #include "aboutdata.h" #include <tqpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqlineedit.h> -#include <textedit.h> +#include <tqtextedit.h> Composer::Composer( TQWidget *parent ) : TQWidget( parent ) @@ -54,7 +54,7 @@ Composer::Composer( TQWidget *parent ) mRecipients = new RecipientsEditor( this ); topLayout->addMultiCellWidget( mRecipients, 1, 1, 0, 1 ); - kdDebug() << "SIZEHINT: " << mRecipients->sizeHint() << endl; + kdDebug() << "SIZEHINT: " << mRecipients->tqsizeHint() << endl; // mRecipients->setFixedHeight( 10 ); diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 154bf97ba..6d00e41c4 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -40,7 +40,7 @@ #include <twin.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcombobox.h> #include <tqpushbutton.h> #include <tqtoolbutton.h> @@ -241,7 +241,7 @@ void RecipientsListToolTip::maybeTip( const TQPoint & pos ) RecipientViewItem *i = static_cast<RecipientViewItem *>( item ); if( item ) { - r = mListView->itemRect( item ); + r = mListView->tqitemRect( item ); TQString tipText( i->recipientItem()->tooltip() ); if ( !tipText.isEmpty() ) { tip( r, tipText ); @@ -783,7 +783,7 @@ void RecipientsPicker::pick( Recipient::Type type ) "recipients is %1. Please adapt the selection.", "You selected %n recipients. The maximum supported number of " "recipients is %1. Please adapt the selection.", count) - .arg( GlobalSettings::self()->maximumRecipients() ) ); + .tqarg( GlobalSettings::self()->maximumRecipients() ) ); return; } diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index 88951fcf7..4027375b9 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -68,7 +68,7 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name, mBtnTo = new TQPushButton( TQString(), hbox, "toBtn" ); mBtnTo->setPixmap( BarIcon( "contents", KIcon::SizeSmall ) ); - mBtnTo->setMinimumSize( mBtnTo->sizeHint() * 1.2 ); + mBtnTo->setMinimumSize( mBtnTo->tqsizeHint() * 1.2 ); TQToolTip::add( mBtnTo, i18n("Use the Address-Selection Dialog") ); TQWhatsThis::add( mBtnTo, i18n("This button opens a separate dialog " "where you can select recipients out " diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp index ef72447d0..0b2b2fb50 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -42,7 +42,7 @@ #include <kregexpeditorinterface.h> #include <kdialog.h> -#include <layout.h> +#include <tqlayout.h> #include <tqstring.h> #include <tqpushbutton.h> #include <tqdialog.h> @@ -82,7 +82,7 @@ namespace KMail { if( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { mRegExpEditButton = new TQPushButton( i18n("Edit..."), this, "mRegExpEditButton" ); - mRegExpEditButton->setSizePolicy( TQSizePolicy::Minimum, + mRegExpEditButton->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); hlay->addWidget( mRegExpEditButton ); diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index 7715c5871..ed8aa5cb7 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -220,7 +220,7 @@ void RenameJob::folderCopyComplete(bool success) config->writeEntry( it.key(), it.data() ); } mNewFolder->readConfig( config ); - // make sure the children state is correct + // make sure the tqchildren state is correct if ( mNewFolder->child() && ( mNewFolder->storage()->hasChildren() == FolderStorage::HasNoChildren ) ) mNewFolder->storage()->updateChildrenState(); diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index fd5c811fa..9cc9e3ecb 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -228,7 +228,7 @@ void KMail::RuleWidgetHandlerManager::unregisterHandler( const RuleWidgetHandler } namespace { - /** Returns the number of immediate children of parent with the given object + /** Returns the number of immediate tqchildren of parent with the given object name. Used by RuleWidgetHandlerManager::createWidgets(). */ int childCount( const TQObject *parent, const char *objName ) @@ -1123,7 +1123,7 @@ namespace { const int status = currenStatusValue( valueStack ); if ( status != -1 ) - return TQString::fromLatin1( KMail::StatusValues[ status ].text ); + return TQString::tqfromLatin1( KMail::StatusValues[ status ].text ); else return TQString(); } @@ -1215,7 +1215,7 @@ namespace { const TQString value = rule->contents(); int valueIndex = 0; for ( ; valueIndex < KMail::StatusValueCountWithoutHidden; ++valueIndex ) - if ( value == TQString::fromLatin1( + if ( value == TQString::tqfromLatin1( KMail::StatusValues[ valueIndex ].text ) ) break; TQComboBox *statusCombo = diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp index 7ef0524d4..1a979d4f9 100644 --- a/kmail/searchjob.cpp +++ b/kmail/searchjob.cpp @@ -46,7 +46,7 @@ using KPIM::ProgressManager; #include <klocale.h> #include <kmessagebox.h> -#include <stylesheet.h> +#include <tqstylesheet.h> namespace KMail { @@ -252,7 +252,7 @@ void SearchJob::slotSearchFolder() // so we need to download all messages and check TQString question = i18n("To execute your search all messages of the folder %1 " "have to be downloaded from the server. This may take some time. " - "Do you want to continue your search?").arg( mFolder->label() ); + "Do you want to continue your search?").tqarg( mFolder->label() ); if ( KMessageBox::warningContinueCancel( 0, question, i18n("Continue Search"), i18n("&Search"), "continuedownloadingforsearch" ) != KMessageBox::Continue ) @@ -267,7 +267,7 @@ void SearchJob::slotSearchFolder() mProgress = ProgressManager::createProgressItem( "ImapSearchDownload" + ProgressManager::getUniqueID(), i18n("Downloading emails from IMAP server"), - i18n( "URL: %1" ).arg( TQStyleSheet::escape( mFolder->folder()->prettyURL() ) ), + i18n( "URL: %1" ).tqarg( TQStyleSheet::escape( mFolder->folder()->prettyURL() ) ), true, mAccount->useSSL() || mAccount->useTLS() ); mProgress->setTotalItems( numMsgs ); diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index dfaa09429..ff2248832 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <klineedit.h> #include <tqpushbutton.h> #include <tqradiobutton.h> @@ -360,7 +360,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); mCutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" ); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updStatus())); + connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updtqStatus())); connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*))); @@ -400,7 +400,7 @@ void SearchWindow::setEnabledSearchButton(bool) } //----------------------------------------------------------------------------- -void SearchWindow::updStatus(void) +void SearchWindow::updtqStatus(void) { TQString genMsg, detailMsg, procMsg; int numMatches = 0, numProcessed = 0; @@ -418,17 +418,17 @@ void SearchWindow::updStatus(void) if(!mStopped) { genMsg = i18n("Done."); detailMsg = i18n("%n match in %1", "%n matches in %1", - numMatches).arg(procMsg); + numMatches).tqarg(procMsg); } else { genMsg = i18n("Search canceled."); detailMsg = i18n("%n match so far in %1", "%n matches so far in %1", - numMatches).arg(procMsg); + numMatches).tqarg(procMsg); } } else { procMsg = i18n("%n message", "%n messages", numProcessed); genMsg = i18n("%n match", "%n matches", numMatches); detailMsg = i18n("Searching in %1. %2 searched so far") - .arg(folderName).arg(procMsg); + .tqarg(folderName).tqarg(procMsg); } mStatusBar->changeItem(genMsg, 0); @@ -466,7 +466,7 @@ void SearchWindow::activateFolder(KMFolder *curFolder) //----------------------------------------------------------------------------- void SearchWindow::slotSearch() { - mLastFocus = focusWidget(); + mLastFocus = tqfocusWidget(); mBtnSearch->setFocus(); // set focus so we don't miss key event mStopped = false; @@ -497,7 +497,7 @@ void SearchWindow::slotSearch() while ((folder = mgr->find(fullName))) { if (folder->storage()->inherits("KMFolderSearch")) break; - fullName = TQString("%1 %2").arg(baseName).arg(++count); + fullName = TQString("%1 %2").tqarg(baseName).tqarg(++count); } if (!folder) @@ -541,7 +541,7 @@ void SearchWindow::slotSearch() void SearchWindow::searchDone() { mTimer->stop(); - updStatus(); + updtqStatus(); TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI())); if(mLastFocus) diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h index 19183e66d..6ea4adf86 100644 --- a/kmail/searchwindow.h +++ b/kmail/searchwindow.h @@ -105,7 +105,7 @@ public: protected slots: /** Update status line widget. */ - virtual void updStatus(void); + virtual void updtqStatus(void); virtual void slotClose(); virtual void slotSearch(); diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp index bf4fbe7bf..9c22539c2 100644 --- a/kmail/sieveconfig.cpp +++ b/kmail/sieveconfig.cpp @@ -23,7 +23,7 @@ #include <kdialog.h> #include <kconfigbase.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <klineedit.h> diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp index 426c93474..1d33e2aac 100644 --- a/kmail/sievedebugdialog.cpp +++ b/kmail/sievedebugdialog.cpp @@ -43,7 +43,7 @@ using KMail::AccountManager; #include "kmkernel.h" #include "sievejob.h" -#include <textedit.h> +#include <tqtextedit.h> using KMail::SieveJob; using KMime::Types::AddrSpecList; @@ -253,7 +253,7 @@ void SieveDebugDialog::slotDiagNextAccount() KMAccount *acc = mAccountList.first(); mAccountList.pop_front(); - mEdit->append( i18n( "Collecting data for account '%1'...\n" ).arg( acc->name() ) ); + mEdit->append( i18n( "Collecting data for account '%1'...\n" ).tqarg( acc->name() ) ); mEdit->append( i18n( "------------------------------------------------------------\n" ) ); mAccountBase = dynamic_cast<KMail::ImapAccountBase *>( acc ); if ( mAccountBase ) @@ -295,7 +295,7 @@ void SieveDebugDialog::slotDiagNextScript() TQString scriptFile = mScriptList.first(); mScriptList.pop_front(); - mEdit->append( i18n( "Contents of script '%1':\n" ).arg( scriptFile ) ); + mEdit->append( i18n( "Contents of script '%1':\n" ).tqarg( scriptFile ) ); mUrl = urlFromAccount( mAccountBase ); mUrl.setFileName( scriptFile ); @@ -324,7 +324,7 @@ void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success, mEdit->append( i18n( "------------------------------------------------------------\n" "%1\n" - "------------------------------------------------------------\n\n" ).arg( script ) ); + "------------------------------------------------------------\n\n" ).tqarg( script ) ); } // Fetch next script @@ -363,7 +363,7 @@ void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success, for ( TQStringList::const_iterator it = scriptList.begin(); it != scriptList.end(); ++it ) mEdit->append( "* " + *it + "\n" ); mEdit->append( "\n" ); - mEdit->append( i18n( "Active script: %1\n\n" ).arg( activeScript ) ); + mEdit->append( i18n( "Active script: %1\n\n" ).tqarg( activeScript ) ); } // Handle next job: dump scripts for this server diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp index 0c020f922..6993f8f66 100644 --- a/kmail/sievejob.cpp +++ b/kmail/sievejob.cpp @@ -26,7 +26,7 @@ using KIO::UDSEntryList; using KIO::UDSEntry; #include <kdebug.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <cassert> diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index 0a4603b08..fb3c7c40d 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -31,8 +31,8 @@ #include <tqdir.h> #include <tqfileinfo.h> #include <tqlabel.h> -#include <layout.h> -#include <textedit.h> +#include <tqlayout.h> +#include <tqtextedit.h> #include <tqwhatsthis.h> #include <tqwidgetstack.h> @@ -52,7 +52,7 @@ namespace KMail { TQVBoxLayout * vlay; TQVBoxLayout * page_vlay; - vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" ); + vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" ); // "enable signatue" checkbox: mEnableCheck = new TQCheckBox( i18n("&Enable signature"), this ); @@ -260,7 +260,7 @@ namespace KMail { // slotEnableEditButton should prevent this assert from being hit: assert( !url.isEmpty() ); - (void)KRun::runURL( KURL( url ), TQString::fromLatin1("text/plain") ); + (void)KRun::runURL( KURL( url ), TQString::tqfromLatin1("text/plain") ); } } // namespace KMail diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp index ba4e34467..8520af848 100644 --- a/kmail/simplestringlisteditor.cpp +++ b/kmail/simplestringlisteditor.cpp @@ -41,7 +41,7 @@ #include <kdebug.h> #include <kpushbutton.h> -#include <layout.h> +#include <tqlayout.h> //******************************************************** diff --git a/kmail/smimeconfiguration.ui b/kmail/smimeconfiguration.ui index 430cbe7f9..287605aa3 100644 --- a/kmail/smimeconfiguration.ui +++ b/kmail/smimeconfiguration.ui @@ -38,7 +38,7 @@ <string>Validate certificates online (OCSP)</string> </property> <property name="whatsThis" stdset="0"> - <string>If this option is selected, S/MIME certificates are validated online using the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP responder below.</string> + <string>If this option is selected, S/MIME certificates are validated online using the Online Certificates tqStatus Protocol (OCSP). Fill in the URL of the OCSP responder below.</string> </property> </widget> <widget class="TQGroupBox"> @@ -54,7 +54,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -80,7 +80,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>150</width> <height>20</height> @@ -202,7 +202,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -312,7 +312,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -351,7 +351,7 @@ The syntax is "HOST" or "HOST:PORT". If PORT is omitted, port 389 (standard LDAP <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>73</height> diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 6c2efb2ec..4197fa196 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -18,7 +18,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <kpushbutton.h> #include <ktextedit.h> #include "kkeybutton.h" @@ -49,8 +49,8 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam connect( snippetName, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()) ); - layout3->addWidget( textLabel3, 7, 0 ); - layout3->addWidget( keyButton, 7, 1 ); + tqlayout3->addWidget( textLabel3, 7, 0 ); + tqlayout3->addWidget( keyButton, 7, 1 ); // tab order setTabOrder( snippetText, keyButton ); diff --git a/kmail/snippetdlgbase.ui b/kmail/snippetdlgbase.ui index 3f05f08f1..5cdf04c73 100644 --- a/kmail/snippetdlgbase.ui +++ b/kmail/snippetdlgbase.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -64,7 +64,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -110,7 +110,7 @@ <property name="text"> <string>&Snippet:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> diff --git a/kmail/snippetsettingsbase.ui b/kmail/snippetsettingsbase.ui index c266a202f..a9949cb55 100644 --- a/kmail/snippetsettingsbase.ui +++ b/kmail/snippetsettingsbase.ui @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> @@ -123,7 +123,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -144,7 +144,7 @@ <property name="name"> <cstring>leDelimiter</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>40</width> <height>32767</height> @@ -164,7 +164,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 128687fc3..aff2e8067 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -14,7 +14,7 @@ #include <kurl.h> #include <kdebug.h> #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <kpushbutton.h> #include <klistview.h> #include <tqheader.h> @@ -145,7 +145,7 @@ void SnippetWidget::slotAdd() SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut ) { SnippetItem * item = new SnippetItem(parent, name, text); - const TQString actionName = i18n("Snippet %1").arg(name); + const TQString actionName = i18n("Snippet %1").tqarg(name); const TQString normalizedName = TQString(actionName).replace(" ", "_"); if ( !mActionCollection->action(normalizedName.utf8().data() ) ) { KAction * action = new KAction( actionName, shortcut, item, @@ -352,8 +352,8 @@ void SnippetWidget::writeConfig() SnippetGroup * group = dynamic_cast<SnippetGroup*>(item); if (group) { //kdDebug(5006) << "-->GROUP " << item->getName() << group->getId() << " " << iGroupCount<< endl; - strKeyName=TQString("snippetGroupName_%1").arg(iGroupCount); - strKeyId=TQString("snippetGroupId_%1").arg(iGroupCount); + strKeyName=TQString("snippetGroupName_%1").tqarg(iGroupCount); + strKeyId=TQString("snippetGroupId_%1").tqarg(iGroupCount); _cfg->writeEntry(strKeyName, group->getName()); _cfg->writeEntry(strKeyId, group->getId()); @@ -361,9 +361,9 @@ void SnippetWidget::writeConfig() iGroupCount++; } else if (dynamic_cast<SnippetItem*>(item)) { //kdDebug(5006) << "-->ITEM " << item->getName() << item->getParent() << " " << iSnipCount << endl; - strKeyName=TQString("snippetName_%1").arg(iSnipCount); - strKeyText=TQString("snippetText_%1").arg(iSnipCount); - strKeyId=TQString("snippetParent_%1").arg(iSnipCount); + strKeyName=TQString("snippetName_%1").tqarg(iSnipCount); + strKeyText=TQString("snippetText_%1").tqarg(iSnipCount); + strKeyId=TQString("snippetParent_%1").tqarg(iSnipCount); _cfg->writeEntry(strKeyName, item->getName()); _cfg->writeEntry(strKeyText, item->getText()); @@ -373,7 +373,7 @@ void SnippetWidget::writeConfig() assert( action ); const KShortcut& sc = action->shortcut(); if (!sc.isNull() ) { - _cfg->writeEntry( TQString("snippetShortcut_%1").arg(iSnipCount), sc.toString() ); + _cfg->writeEntry( TQString("snippetShortcut_%1").tqarg(iSnipCount), sc.toString() ); } iSnipCount++; } else { @@ -389,8 +389,8 @@ void SnippetWidget::writeConfig() for ( it = _mapSaved.begin(); it != _mapSaved.end(); ++it ) { //write the saved variable values if (it.data().length()<=0) continue; //is the saved value has no length -> no need to save it - strKeyName=TQString("snippetSavedName_%1").arg(iCount); - strKeyText=TQString("snippetSavedVal_%1").arg(iCount); + strKeyName=TQString("snippetSavedName_%1").tqarg(iCount); + strKeyText=TQString("snippetSavedVal_%1").tqarg(iCount); _cfg->writeEntry(strKeyName, it.key()); _cfg->writeEntry(strKeyText, it.data()); @@ -434,8 +434,8 @@ void SnippetWidget::initConfig() int iCount = _cfg->readNumEntry("snippetGroupCount", -1); for ( int i=0; i<iCount; i++) { //read the group-list - strKeyName=TQString("snippetGroupName_%1").arg(i); - strKeyId=TQString("snippetGroupId_%1").arg(i); + strKeyName=TQString("snippetGroupName_%1").tqarg(i); + strKeyId=TQString("snippetGroupId_%1").tqarg(i); TQString strNameVal=""; int iIdVal=-1; @@ -460,9 +460,9 @@ void SnippetWidget::initConfig() if (iCount != -1) { iCount = _cfg->readNumEntry("snippetCount", 0); for ( int i=0; i<iCount; i++) { //read the snippet-list - strKeyName=TQString("snippetName_%1").arg(i); - strKeyText=TQString("snippetText_%1").arg(i); - strKeyId=TQString("snippetParent_%1").arg(i); + strKeyName=TQString("snippetName_%1").tqarg(i); + strKeyText=TQString("snippetText_%1").tqarg(i); + strKeyId=TQString("snippetParent_%1").tqarg(i); TQString strNameVal=""; TQString strTextVal=""; @@ -474,7 +474,7 @@ void SnippetWidget::initConfig() //kdDebug(5006) << "Read item " << strNameVal << " " << iParentVal << endl; if (strNameVal != "" && strTextVal != "" && iParentVal != -1) { - KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").arg(i), TQString() ) ); + KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").tqarg(i), TQString() ) ); item = makeItem( SnippetItem::findGroupById(iParentVal, _list), strNameVal, strTextVal, shortcut ); //kdDebug(5006) << "Created item " << item->getName() << " " << item->getParent() << endl; _list.append(item); @@ -487,8 +487,8 @@ void SnippetWidget::initConfig() iCount = _cfg->readNumEntry("snippetSavedCount", 0); for ( int i=1; i<=iCount; i++) { //read the saved-values and store in TQMap - strKeyName=TQString("snippetSavedName_%1").arg(i); - strKeyText=TQString("snippetSavedVal_%1").arg(i); + strKeyName=TQString("snippetSavedName_%1").tqarg(i); + strKeyText=TQString("snippetSavedVal_%1").tqarg(i); TQString strNameVal=""; TQString strTextVal=""; @@ -521,7 +521,7 @@ void SnippetWidget::maybeTip( const TQPoint & p ) if (!item) return; - TQRect r = itemRect( item ); + TQRect r = tqitemRect( item ); if (r.isValid() && _SnippetConfig.useToolTips() ) @@ -586,7 +586,7 @@ TQString SnippetWidget::parseText(TQString text, TQString del) if ( strName != del+del ) { //if not doubel-delimiter if (iInMeth == 0) { //if input-method "single" is selected if ( mapVar[strName].length() <= 0 ) { // and not already in map - strMsg=i18n("Please enter the value for <b>%1</b>:").arg(strName); + strMsg=i18n("Please enter the value for <b>%1</b>:").tqarg(strName); strNew = showSingleVarDialog( strName, &_mapSaved, rSingle ); if (strNew=="") return ""; //user clicked Cancle @@ -660,7 +660,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ TQDialog dlg(this); dlg.setCaption(i18n("Enter Values for Variables")); - TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout"); + TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn"); @@ -670,15 +670,15 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ TQCheckBox * cb = NULL; labTop = new TQLabel( &dlg, "label" ); - labTop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, labTop->sizePolicy().hasHeightForWidth() ) ); labTop->setText(i18n("Enter the replacement values for these variables:")); layoutTop->addWidget(labTop, 0, 0); - layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); int i = 0; //walk through the variable map and add - for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout + for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main tqlayout if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter()) continue; @@ -705,20 +705,20 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ i++; } - layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); - btn1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn1->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn1, 0, 0 ); KPushButton * btn2 = new KPushButton( KStdGuiItem::apply(), &dlg, "pushButton2" ); btn2->setDefault( TRUE ); - btn2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, + btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btn2->sizePolicy().hasHeightForWidth() ) ); layoutBtn->addWidget( btn2, 0, 1 ); - layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots @@ -729,7 +729,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ bool bReturn = false; //resize the textedits if (iWidth > 1) { - TQRect r = dlg.geometry(); + TQRect r = dlg.tqgeometry(); r.setHeight(iBasicHeight + iOneHeight*mapVar2Te.count()); r.setWidth(iWidth); dlg.setGeometry(r); @@ -750,9 +750,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ } bReturn = true; - iBasicHeight = dlg.geometry().height() - layoutVar->geometry().height(); - iOneHeight = layoutVar->geometry().height() / mapVar2Te.count(); - iWidth = dlg.geometry().width(); + iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height(); + iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count(); + iWidth = dlg.tqgeometry().width(); } //do some cleanup @@ -767,7 +767,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ delete layoutTop; delete layoutVar; delete layoutBtn; - delete layout; + delete tqlayout; if (i==0) //if nothing happened this means, that there are no variables to translate return true; //.. so just return OK @@ -788,7 +788,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri TQDialog dlg(this); dlg.setCaption(i18n("Enter Values for Variables")); - TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout"); + TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout"); TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop"); TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar"); TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn"); @@ -799,8 +799,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri labTop = new TQLabel( &dlg, "label" ); layoutTop->addWidget(labTop, 0, 0); - labTop->setText(i18n("Enter the replacement values for %1:").arg( var )); - layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); + labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var )); + tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 ); cb = new TQCheckBox( &dlg, "cbVar" ); @@ -820,7 +820,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri "If you use the same variable later, even in another snippet, the value entered to the right " "will be the default value for that variable.") ); - layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); + tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 ); KPushButton * btn1 = new KPushButton( KStdGuiItem::cancel(), &dlg, "pushButton1" ); layoutBtn->addWidget( btn1, 0, 0 ); @@ -829,7 +829,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri btn2->setDefault( TRUE ); layoutBtn->addWidget( btn2, 0, 1 ); - layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); + tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 ); te->setFocus(); // --END-- building a dynamic dialog @@ -849,7 +849,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri strReturn = te->text(); //copy the entered values back the the given map - dlgSize = dlg.geometry(); + dlgSize = dlg.tqgeometry(); } //do some cleanup @@ -861,7 +861,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri delete layoutTop; delete layoutVar; delete layoutBtn; - delete layout; + delete tqlayout; return strReturn; } @@ -912,7 +912,7 @@ void SnippetWidget::slotDropped(TQDropEvent *e, TQListViewItem *) group = dynamic_cast<SnippetGroup *>(item2->parent()); TQCString dropped; - TQByteArray data = e->encodedData("text/plain"); + TQByteArray data = e->tqencodedData("text/plain"); if ( e->provides("text/plain") && data.size()>0 ) { //get the data from the event... TQString encData(data.data()); diff --git a/kmail/stringutil.cpp b/kmail/stringutil.cpp index 907c5e1fb..e3a2243c8 100644 --- a/kmail/stringutil.cpp +++ b/kmail/stringutil.cpp @@ -29,7 +29,7 @@ namespace StringUtil TQString encodeMailtoUrl( const TQString& str ) { TQString result; - result = TQString::fromLatin1( KMMsgBase::encodeRFC2047String( str, + result = TQString::tqfromLatin1( KMMsgBase::encodeRFC2047String( str, "utf-8" ) ); result = KURL::encode_string( result ); return result; diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index 992ce2c48..5b9fbf7ee 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -374,7 +374,7 @@ void SubscriptionDialog::doSave() if( !a->onlySubscribedFolders() ) { int result = KMessageBox::questionYesNoCancel( this, i18n("Currently subscriptions are not used for server. %1\nDo you want to enable subscriptions?") - .arg( a->name() ), + .tqarg( a->name() ), i18n("Enable Subscriptions?"), i18n("Enable"), i18n("Do Not Enable")); switch(result) { case KMessageBox::Yes: @@ -414,7 +414,7 @@ void SubscriptionDialog::processItems() uint done = 0; for (uint i = mCount; i < mFolderNames.count(); ++i) { - // give the dialog a chance to repaint + // give the dialog a chance to tqrepaint if (done == 1000) { emit listChanged(); diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index 2feebf4e1..8dce59d4e 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -261,7 +261,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( mDebug ) { KMessageBox::error( 0, i18n( "Cannot insert content from file %1: %2" ). - arg( path ).arg( file.errorString() ) ); + tqarg( path ).tqarg( file.errorString() ) ); } } else if ( cmd.startsWith( "SYSTEM=" ) ) { @@ -294,7 +294,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( mDebug ) { KMessageBox::error( 0, i18n( "Cannot insert content from file %1: %2"). - arg( path ).arg(file.errorString() )); + tqarg( path ).tqarg(file.errorString() )); } } else if ( cmd.startsWith( "QUOTEPIPE=" ) ) { @@ -396,7 +396,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) kdDebug() << "Command: OTEXTSIZE" << endl; i += strlen( "OTEXTSIZE" ); if ( mOrigMsg ) { - TQString str = TQString( "%1" ).arg( mOrigMsg->body().length() ); + TQString str = TQString( "%1" ).tqarg( mOrigMsg->body().length() ); body.append( str ); } @@ -693,7 +693,7 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( cmd.startsWith( "DATEEN" ) ) { kdDebug() << "Command: DATEEN" << endl; i += strlen( "DATEEN" ); - TQDateTime date = TQDateTime::currentDateTime(); + TQDateTime date = TQDateTime::tqcurrentDateTime(); KLocale locale( "C" ); TQString str = locale.formatDate( date.date(), false ); body.append( str ); @@ -701,28 +701,28 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( cmd.startsWith( "DATESHORT" ) ) { kdDebug() << "Command: DATESHORT" << endl; i += strlen( "DATESHORT" ); - TQDateTime date = TQDateTime::currentDateTime(); + TQDateTime date = TQDateTime::tqcurrentDateTime(); TQString str = KGlobal::locale()->formatDate( date.date(), true ); body.append( str ); } else if ( cmd.startsWith( "DATE" ) ) { kdDebug() << "Command: DATE" << endl; i += strlen( "DATE" ); - TQDateTime date = TQDateTime::currentDateTime(); + TQDateTime date = TQDateTime::tqcurrentDateTime(); TQString str = KGlobal::locale()->formatDate( date.date(), false ); body.append( str ); } else if ( cmd.startsWith( "DOW" ) ) { kdDebug() << "Command: DOW" << endl; i += strlen( "DOW" ); - TQDateTime date = TQDateTime::currentDateTime(); + TQDateTime date = TQDateTime::tqcurrentDateTime(); TQString str = KGlobal::locale()->calendar()->weekDayName( date.date(), false ); body.append( str ); } else if ( cmd.startsWith( "TIMELONGEN" ) ) { kdDebug() << "Command: TIMELONGEN" << endl; i += strlen( "TIMELONGEN" ); - TQDateTime date = TQDateTime::currentDateTime(); + TQDateTime date = TQDateTime::tqcurrentDateTime(); KLocale locale( "C"); TQString str = locale.formatTime( date.time(), true ); body.append( str ); @@ -730,14 +730,14 @@ void TemplateParser::processWithTemplate( const TQString &tmpl ) } else if ( cmd.startsWith( "TIMELONG" ) ) { kdDebug() << "Command: TIMELONG" << endl; i += strlen( "TIMELONG" ); - TQDateTime date = TQDateTime::currentDateTime(); + TQDateTime date = TQDateTime::tqcurrentDateTime(); TQString str = KGlobal::locale()->formatTime( date.time(), true ); body.append( str ); } else if ( cmd.startsWith( "TIME" ) ) { kdDebug() << "Command: TIME" << endl; i += strlen( "TIME" ); - TQDateTime date = TQDateTime::currentDateTime(); + TQDateTime date = TQDateTime::tqcurrentDateTime(); TQString str = KGlobal::locale()->formatTime( date.time(), false ); body.append( str ); @@ -967,7 +967,7 @@ void TemplateParser::addProcessedBodyToMessage( const TQString &body ) DwParameter *nameParameter = new DwParameter; nameParameter->SetAttribute( "name" ); nameParameter->SetValue( Util::dwString( KMMsgBase::encodeRFC2231StringAutoDetectCharset( - i18n( "Attachment %1" ).arg( attachmentNumber ) ) ) ); + i18n( "Attachment %1" ).tqarg( attachmentNumber ) ) ) ); ct.AddParameter( nameParameter ); } } @@ -1059,7 +1059,7 @@ TQString TemplateParser::findTemplate() TQString iid; if ( mIdentity ) { - iid = TQString("IDENTITY_%1").arg( mIdentity ); // templates ID for that identity + iid = TQString("IDENTITY_%1").tqarg( mIdentity ); // templates ID for that identity } else { iid = "IDENTITY_NO_IDENTITY"; // templates ID for no identity @@ -1148,11 +1148,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mPipeErr.isEmpty() ) { KMessageBox::error( 0, i18n( "Pipe command exit with status %1: %2"). - arg( mPipeRc ).arg( cmd ) ); + tqarg( mPipeRc ).tqarg( cmd ) ); } else { KMessageBox::detailedError( 0, i18n( "Pipe command exit with status %1: %2" ). - arg( mPipeRc ).arg( cmd ), mPipeErr ); + tqarg( mPipeRc ).tqarg( cmd ), mPipeErr ); } } @@ -1163,11 +1163,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mPipeErr.isEmpty() ) { KMessageBox::error( 0, i18n( "Pipe command killed by signal %1: %2" ). - arg( -(mPipeRc) ).arg( cmd ) ); + tqarg( -(mPipeRc) ).tqarg( cmd ) ); } else { KMessageBox::detailedError( 0, i18n( "Pipe command killed by signal %1: %2" ). - arg( -(mPipeRc) ).arg( cmd ), mPipeErr ); + tqarg( -(mPipeRc) ).tqarg( cmd ), mPipeErr ); } } } @@ -1179,7 +1179,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mDebug ) { KMessageBox::error( 0, i18n( "Pipe command did not finish within %1 seconds: %2" ). - arg( PipeTimeout ).arg( cmd ) ); + tqarg( PipeTimeout ).tqarg( cmd ) ); } } @@ -1190,11 +1190,11 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) if ( mDebug ) { if ( mPipeErr.isEmpty() ) { KMessageBox::error( 0, - i18n( "Cannot write to process stdin: %1" ).arg( cmd ) ); + i18n( "Cannot write to process stdin: %1" ).tqarg( cmd ) ); } else { KMessageBox::detailedError( 0, i18n( "Cannot write to process stdin: %1" ). - arg( cmd ), mPipeErr ); + tqarg( cmd ), mPipeErr ); } } } @@ -1202,7 +1202,7 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) } else if ( mDebug ) { KMessageBox::error( 0, i18n( "Cannot start pipe command from template: %1" ). - arg( cmd ) ); + tqarg( cmd ) ); } return mPipeOut; diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 7b80c7c67..b3c05c293 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -24,7 +24,7 @@ #include <kglobal.h> #include <tqpopupmenu.h> #include <tqpushbutton.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqlineedit.h> #include <tqtoolbox.h> #include <kdebug.h> @@ -47,8 +47,8 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na textEdit_reply_all->setFont( f ); textEdit_forward->setFont( f ); - setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); - sizeHint(); + tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + tqsizeHint(); connect( textEdit_new, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged( void ) ) ); @@ -102,7 +102,7 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na "if they are specified.</p>" "</qt>" ); } - mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) ); + mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).tqarg( help ) ); } void TemplatesConfiguration::slotTextChanged() @@ -163,7 +163,7 @@ void TemplatesConfiguration::saveToGlobal() void TemplatesConfiguration::loadFromIdentity( uint id ) { - Templates t( TQString("IDENTITY_%1").arg( id ) ); + Templates t( TQString("IDENTITY_%1").tqarg( id ) ); TQString str; @@ -215,7 +215,7 @@ void TemplatesConfiguration::loadFromIdentity( uint id ) void TemplatesConfiguration::saveToIdentity( uint id ) { - Templates t( TQString("IDENTITY_%1").arg( id ) ); + Templates t( TQString("IDENTITY_%1").tqarg( id ) ); t.setTemplateNewMessage( strOrBlank( textEdit_new->text() ) ); t.setTemplateReply( strOrBlank( textEdit_reply->text() ) ); @@ -231,7 +231,7 @@ void TemplatesConfiguration::loadFromFolder( TQString id, uint identity ) Templates* tid = 0; if ( identity ) { - tid = new Templates( TQString("IDENTITY_%1").arg( identity ) ); + tid = new Templates( TQString("IDENTITY_%1").tqarg( identity ) ); } TQString str; @@ -344,7 +344,7 @@ void TemplatesConfiguration::loadFromPhrases() "---------- %1 ----------\n" "%TEXT\n" "-------------------------------------------------------\n" - ) ).arg( convertPhrases( str ) ) ); + ) ).tqarg( convertPhrases( str ) ) ); } else { textEdit_forward->setText( defaultForward() ); @@ -400,7 +400,7 @@ void TemplatesConfiguration::importFromPhrases() "\n" "%TEXT\n" "-------------------------------------------------------\n" - ) ).arg( convertPhrases( str ) ) ); + ) ).tqarg( convertPhrases( str ) ) ); } else { GlobalSettings::self()->setTemplateForward( defaultForward() ); diff --git a/kmail/templatesconfiguration_base.ui b/kmail/templatesconfiguration_base.ui index c1ed8d44c..fba3da7ef 100644 --- a/kmail/templatesconfiguration_base.ui +++ b/kmail/templatesconfiguration_base.ui @@ -20,7 +20,7 @@ <verstretch>3</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>300</height> @@ -45,7 +45,7 @@ <verstretch>3</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -86,7 +86,7 @@ <verstretch>3</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -258,7 +258,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -284,7 +284,7 @@ <property name="text"> <string>&Quote indicator:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index f084be379..825585633 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -325,7 +325,7 @@ TemplatesInsertCommand::~TemplatesInsertCommand() void TemplatesInsertCommand::slotClicked() { - TQSize ps = mMenu->popupMenu()->sizeHint(); + TQSize ps = mMenu->popupMenu()->tqsizeHint(); mMenu->popup( mapToGlobal( TQPoint( 0, -(ps.height()) ) ) ); } diff --git a/kmail/tests/signedmail.mbox b/kmail/tests/signedmail.mbox index 1df5f3eed..5d1a286ab 100644 --- a/kmail/tests/signedmail.mbox +++ b/kmail/tests/signedmail.mbox @@ -31,7 +31,7 @@ Content-Type: multipart/signed; Message-Id: <20070403084156.C961269606@smtp4-g19.free.fr> To: undisclosed-recipients:; X-Virus-Scanned: by amavisd-new at kdab.net -X-Spam-Status: Yes, score=7.598 tagged_above=3 required=6.3 +X-Spam-tqStatus: Yes, score=7.598 tagged_above=3 required=6.3 tests=[BAYES_50=0.001, DATE_IN_PAST_96_XX=2.02, DNS_FROM_AHBL_RHSBL=0.231, DNS_FROM_RFC_ABUSE=0.2, DNS_FROM_RFC_DSN=2.597, DNS_FROM_RFC_POST=1.708, UNDISC_RECIPS=0.841] @@ -41,8 +41,8 @@ X-Spam-Flag: YES X-Kolab-Scheduling-Message: FALSE X-UID: 68768 X-Length: 3235 -Status: RO -X-Status: RPT +tqStatus: RO +X-tqStatus: RPT X-KMail-EncryptionState: X-KMail-SignatureState: X-KMail-MDN-Sent: diff --git a/kmail/twindowpositioner.cpp b/kmail/twindowpositioner.cpp index dde045845..fbcb97607 100644 --- a/kmail/twindowpositioner.cpp +++ b/kmail/twindowpositioner.cpp @@ -29,7 +29,7 @@ KWindowPositioner::KWindowPositioner( TQWidget *master, TQWidget *slave, Mode mode ) : TQObject( master ), mMaster( master ), mSlave( slave ), mMode( mode ) { - master->topLevelWidget()->installEventFilter( this ); + master->tqtopLevelWidget()->installEventFilter( this ); } bool KWindowPositioner::eventFilter( TQObject *, TQEvent *e ) diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index ad9c22eb2..7b88c0291 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -561,7 +561,7 @@ namespace { TQString displayName, libName, keyId; if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) ) return TQString(); - return i18n("Show certificate 0x%1").arg( keyId ); + return i18n("Show certificate 0x%1").tqarg( keyId ); } } @@ -689,8 +689,8 @@ namespace { if ( name.isEmpty() ) name = msgPart.name(); if ( !name.isEmpty() ) - return i18n( "Attachment: %1" ).arg( name ); - return i18n( "Attachment #%1 (unnamed)" ).arg( KMReaderWin::msgPartFromUrl( url ) ); + return i18n( "Attachment: %1" ).tqarg( name ); + return i18n( "Attachment #%1 (unnamed)" ).tqarg( KMReaderWin::msgPartFromUrl( url ) ); } } diff --git a/kmail/util.cpp b/kmail/util.cpp index bbf15ba56..d153e9d37 100644 --- a/kmail/util.cpp +++ b/kmail/util.cpp @@ -146,7 +146,7 @@ void KMail::Util::append( TQByteArray& that, const TQByteArray& str ) that.detach(); uint len1 = that.size(); uint len2 = str.size(); - if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) ) + if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str.data(), len2 ); } @@ -157,7 +157,7 @@ void KMail::Util::append( TQByteArray& that, const char* str ) that.detach(); uint len1 = that.size(); uint len2 = tqstrlen(str); - if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) ) + if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str, len2 ); } @@ -166,7 +166,7 @@ void KMail::Util::append( TQByteArray& that, const TQCString& str ) that.detach(); uint len1 = that.size(); uint len2 = str.size() - 1; - if ( that.resize( len1 + len2, TQGArray::SpeedOptim ) ) + if ( that.tqresize( len1 + len2, TQGArray::SpeedOptim ) ) memcpy( that.data() + len1, str.data(), len2 ); } @@ -180,13 +180,13 @@ void KMail::Util::insert( TQByteArray& that, uint index, const char* s ) int nlen = olen + len; if ( index >= olen ) { // insert after end of string that.detach(); - if ( that.resize(nlen+index-olen, TQGArray::SpeedOptim ) ) { + if ( that.tqresize(nlen+index-olen, TQGArray::SpeedOptim ) ) { memset( that.data()+olen, ' ', index-olen ); memcpy( that.data()+index, s, len ); } } else { that.detach(); - if ( that.resize(nlen, TQGArray::SpeedOptim ) ) { // normal insert + if ( that.tqresize(nlen, TQGArray::SpeedOptim ) ) { // normal insert memmove( that.data()+index+len, that.data()+index, olen-index ); memcpy( that.data()+index, s, len ); } diff --git a/kmail/util.h b/kmail/util.h index 9f291a2e0..0d1e263f7 100644 --- a/kmail/util.h +++ b/kmail/util.h @@ -206,7 +206,7 @@ namespace Util { KMessageBox::warningContinueCancel( w, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ), + "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ) ) return false; diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index d3d374aea..fbcf46c82 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -469,21 +469,21 @@ namespace KMail { } addressesArgument += sl.join( ", " ) + " ] "; } - TQString script = TQString::fromLatin1("require \"vacation\";\n\n" ); + TQString script = TQString::tqfromLatin1("require \"vacation\";\n\n" ); if ( !sendForSpam ) - script += TQString::fromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\"" + script += TQString::tqfromLatin1( "if header :contains \"X-Spam-Flag\" \"YES\"" " { keep; stop; }\n" ); // FIXME? if ( !domain.isEmpty() ) // FIXME - script += TQString::fromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).arg( domain ); + script += TQString::tqfromLatin1( "if not address :domain :contains \"from\" \"%1\" { keep; stop; }\n" ).tqarg( domain ); script += "vacation "; script += addressesArgument; if ( notificationInterval > 0 ) - script += TQString::fromLatin1(":days %1 ").arg( notificationInterval ); - script += TQString::fromLatin1("text:\n"); + script += TQString::tqfromLatin1(":days %1 ").tqarg( notificationInterval ); + script += TQString::tqfromLatin1("text:\n"); script += dotstuff( messageText.isEmpty() ? defaultMessageText() : messageText ); - script += TQString::fromLatin1( "\n.\n;\n" ); + script += TQString::tqfromLatin1( "\n.\n;\n" ); return script; } @@ -573,7 +573,7 @@ namespace KMail { "\n" "Yours sincerely,\n" "-- <enter your name and email address here>\n") - .arg( KGlobal::locale()->formatDate( TQDate::currentDate().addDays( 1 ) ) ); + .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate().addDays( 1 ) ) ); } int Vacation::defaultNotificationInterval() { diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp index 759ae481d..e214a46cd 100644 --- a/kmail/vacationdialog.cpp +++ b/kmail/vacationdialog.cpp @@ -30,11 +30,11 @@ using KMime::HeaderParsing::parseAddressList; #include <twin.h> #include <kapplication.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqlineedit.h> -#include <textedit.h> +#include <tqtextedit.h> #include <tqvalidator.h> namespace KMail { diff --git a/kmail/warningconfiguration.ui b/kmail/warningconfiguration.ui index cef88e257..c31bdb381 100644 --- a/kmail/warningconfiguration.ui +++ b/kmail/warningconfiguration.ui @@ -103,7 +103,7 @@ It is recommended to leave this option turned on for maximum security. <property name="text"> <string>For signing</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -114,7 +114,7 @@ It is recommended to leave this option turned on for maximum security. <property name="text"> <string>For encryption</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -329,7 +329,7 @@ The recommended SPHINX setting is 14 days. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -348,7 +348,7 @@ The recommended SPHINX setting is 14 days. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> @@ -357,7 +357,7 @@ The recommended SPHINX setting is 14 days. </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -373,7 +373,7 @@ The recommended SPHINX setting is 14 days. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index 36e71a2f9..5b56e2919 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -57,7 +57,7 @@ using namespace KABC; #include <tqcombobox.h> #include <tqimage.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> #include <tqwidgetstack.h> @@ -84,7 +84,7 @@ namespace KMail { TQPushButton * mFromFileBtn; TQPushButton * mFromAddrbkBtn; - vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main layout" ); + vlay = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "main tqlayout" ); hlay = new TQHBoxLayout( vlay ); // "enable X-Face" checkbox: @@ -147,7 +147,7 @@ namespace KMail { mFromFileBtn = new TQPushButton( i18n("Select File..."), page ); TQWhatsThis::add( mFromFileBtn, i18n("Use this to select an image file to create the picture from. " - "The image should be of high contrast and nearly quadratic shape. " + "The image should be of high contrast and nearly quadratic tqshape. " "A light background helps improve the result." ) ); mFromFileBtn->setAutoDefault( false ); page_vlay->addWidget( mFromFileBtn, 1 ); @@ -165,7 +165,7 @@ namespace KMail { "monochrome picture with every message. " "For example, this could be a picture of you or a glyph. " "It is shown in the recipient's mail client (if supported)." ), page ); - label1->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); + label1->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter ); page_vlay->addWidget( label1 ); widgetStack->raiseWidget( 0 ); // since mSourceCombo->currentItem() == 0 @@ -266,7 +266,7 @@ namespace KMail { TQString str = mTextEdit->text(); if ( !str.isEmpty() ) { - if ( str.startsWith("x-face:", false) ) + if ( str.tqstartsWith("x-face:", false) ) { str = str.remove("x-face:", false); mTextEdit->setText(str); diff --git a/kmail/xfaceconfigurator.h b/kmail/xfaceconfigurator.h index 6c33ed06f..e8fa1b0e7 100644 --- a/kmail/xfaceconfigurator.h +++ b/kmail/xfaceconfigurator.h @@ -18,7 +18,7 @@ #define __KMAIL_XFACECONFIGURATOR_H__ #include <tqwidget.h> -#include <textedit.h> +#include <tqtextedit.h> class KURL; |