From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmail/antispamwizard.cpp | 74 ++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'kmail/antispamwizard.cpp') diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 15b3e7f7..af32ec48 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -17,11 +17,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -57,8 +57,8 @@ using namespace KMail; AntiSpamWizard::AntiSpamWizard( WizardMode mode, - TQWidget* parent, KMFolderTree * mainFolderTree ) - : KWizard( parent ), + TQWidget* tqparent, KMFolderTree * mainFolderTree ) + : KWizard( tqparent ), mInfoPage( 0 ), mSpamRulesPage( 0 ), mVirusRulesPage( 0 ), @@ -150,7 +150,7 @@ void AntiSpamWizard::accept() KMFilterActionDict dict; TQValueList filterList; - bool tqreplaceExistingFilters = false; + bool replaceExistingFilters = false; // Let's start with virus detection and handling, // so we can avoid spam checks for viral messages @@ -227,10 +227,10 @@ void AntiSpamWizard::accept() } } else { // AntiSpam mode - // TODO Existing filters with same name are tqreplaced. This is hardcoded - // ATM and needs to be tqreplaced with a value from a (still missing) - // checkbox in the GUI. At least, the tqreplacement is announced in the GUI. - tqreplaceExistingFilters = true; + // TODO Existing filters with same name are replaced. This is hardcoded + // ATM and needs to be replaced with a value from a (still missing) + // checkbox in the GUI. At least, the replacement is announced in the GUI. + replaceExistingFilters = true; for ( TQValueListIterator it = mToolList.begin(); it != mToolList.end(); ++it ) { if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) && @@ -245,7 +245,7 @@ void AntiSpamWizard::accept() pipeFilterAction->argsFromString( (*it).getDetectCmd() ); pipeFilterActions->append( pipeFilterAction ); KMSearchPattern* pipeFilterPattern = pipeFilter->pattern(); - if ( tqreplaceExistingFilters ) + if ( replaceExistingFilters ) pipeFilterPattern->setName( (*it).getFilterName() ); else pipeFilterPattern->setName( uniqueNameFor( (*it).getFilterName() ) ); @@ -279,7 +279,7 @@ void AntiSpamWizard::accept() spamFilterActions->append( spamFilterAction3 ); } KMSearchPattern* spamFilterPattern = spamFilter->pattern(); - if ( tqreplaceExistingFilters ) + if ( replaceExistingFilters ) spamFilterPattern->setName( i18n( "Spam handling" ) ); else spamFilterPattern->setName( uniqueNameFor( i18n( "Spam handling" ) ) ); @@ -320,7 +320,7 @@ void AntiSpamWizard::accept() unsureFilterAction1->argsFromString( mSpamRulesPage->selectedUnsureFolderName() ); unsureFilterActions->append( unsureFilterAction1 ); KMSearchPattern* unsureFilterPattern = unsureFilter->pattern(); - if ( tqreplaceExistingFilters ) + if ( replaceExistingFilters ) unsureFilterPattern->setName( i18n( "Semi spam (unsure) handling" ) ); else unsureFilterPattern->setName( uniqueNameFor( i18n( "Semi spam (unsure) handling" ) ) ); @@ -382,7 +382,7 @@ void AntiSpamWizard::accept() } KMSearchPattern* classSpamFilterPattern = classSpamFilter->pattern(); - if ( tqreplaceExistingFilters ) + if ( replaceExistingFilters ) classSpamFilterPattern->setName( i18n( "Classify as spam" ) ); else classSpamFilterPattern->setName( uniqueNameFor( i18n( "Classify as spam" ) ) ); @@ -414,7 +414,7 @@ void AntiSpamWizard::accept() } } KMSearchPattern* classHamFilterPattern = classHamFilter->pattern(); - if ( tqreplaceExistingFilters ) + if ( replaceExistingFilters ) classHamFilterPattern->setName( i18n( "Classify as NOT spam" ) ); else classHamFilterPattern->setName( uniqueNameFor( i18n( "Classify as NOT spam" ) ) ); @@ -441,7 +441,7 @@ void AntiSpamWizard::accept() * initialized. This should happend only once. */ if ( !filterList.isEmpty() ) KMKernel::self()->filterMgr()->appendFilters( - filterList, tqreplaceExistingFilters ); + filterList, replaceExistingFilters ); TQDialog::accept(); } @@ -550,7 +550,7 @@ void AntiSpamWizard::slotBuildSummary() { TQString text; TQString newFilters; - TQString tqreplaceFilters; + TQString replaceFilters; if ( mMode == AntiVirus ) { text = ""; // TODO add summary for the virus part @@ -571,10 +571,10 @@ void AntiSpamWizard::slotBuildSummary() it != mToolList.end(); ++it ) { if ( mInfoPage->isProgramSelected( (*it).getVisibleName() ) && (*it).isSpamTool() && !(*it).isDetectionOnly() ) { - sortFilterOnExistance( (*it).getFilterName(), newFilters, tqreplaceFilters ); + sortFilterOnExistance( (*it).getFilterName(), newFilters, replaceFilters ); } } - sortFilterOnExistance( i18n( "Spam handling" ), newFilters, tqreplaceFilters ); + sortFilterOnExistance( i18n( "Spam handling" ), newFilters, replaceFilters ); // The need for a andling of status "probably spam" depends on the tools chosen if ( mSpamRulesPage->moveUnsureSelected() ) { @@ -588,7 +588,7 @@ void AntiSpamWizard::slotBuildSummary() } if ( atLeastOneUnsurePattern ) { sortFilterOnExistance( i18n( "Semi spam (unsure) handling" ), - newFilters, tqreplaceFilters ); + newFilters, replaceFilters ); text += i18n( "

The folder for messages classified as unsure (probably spam) is " ) + mSpamRulesPage->selectedUnsureFolderName() + ".

"; } @@ -596,17 +596,17 @@ void AntiSpamWizard::slotBuildSummary() // Manual classification via toolbar icon / manually applied filter action sortFilterOnExistance( i18n( "Classify as spam" ), - newFilters, tqreplaceFilters ); + newFilters, replaceFilters ); sortFilterOnExistance( i18n( "Classify as NOT spam" ), - newFilters, tqreplaceFilters ); + newFilters, replaceFilters ); // Show the filters in the summary if ( !newFilters.isEmpty() ) text += i18n( "

The wizard will create the following filters:

    " ) + newFilters + "

"; - if ( !tqreplaceFilters.isEmpty() ) - text += i18n( "

The wizard will tqreplace the following filters:

    " ) - + tqreplaceFilters + "

"; + if ( !replaceFilters.isEmpty() ) + text += i18n( "

The wizard will replace the following filters:

    " ) + + replaceFilters + "

"; } mSummaryPage->setSummaryText( text ); @@ -639,12 +639,12 @@ const TQString AntiSpamWizard::uniqueNameFor( const TQString & name ) void AntiSpamWizard::sortFilterOnExistance( const TQString & intendedFilterName, - TQString & newFilters, TQString & tqreplaceFilters ) + TQString & newFilters, TQString & replaceFilters ) { if ( uniqueNameFor( intendedFilterName ) == intendedFilterName ) newFilters += "
  • " + intendedFilterName + "
    • "; else - tqreplaceFilters += "
  • " + intendedFilterName + "
    • "; + replaceFilters += "
  • " + intendedFilterName + "
    • "; } @@ -830,9 +830,9 @@ void AntiSpamWizard::ConfigReader::sortToolList() //--------------------------------------------------------------------------- -ASWizPage::ASWizPage( TQWidget * parent, const char * name, +ASWizPage::ASWizPage( TQWidget * tqparent, const char * name, const TQString *bannerName ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { TQString banner = "kmwizard.png"; if ( bannerName && !bannerName->isEmpty() ) @@ -852,8 +852,8 @@ ASWizPage::ASWizPage( TQWidget * parent, const char * name, //--------------------------------------------------------------------------- ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, - TQWidget * parent, const char * name ) - : ASWizPage( parent, name ) + TQWidget * tqparent, const char * name ) + : ASWizPage( tqparent, name ) { TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); @@ -936,9 +936,9 @@ void ASWizInfoPage::processSelectionChange() //--------------------------------------------------------------------------- -ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, +ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree ) - : ASWizPage( parent, name ) + : ASWizPage( tqparent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( mLayout ); @@ -1059,9 +1059,9 @@ void ASWizSpamRulesPage::allowUnsureFolderSelection( bool enabled ) //--------------------------------------------------------------------------- -ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name, +ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * tqparent, const char * name, KMFolderTree * mainFolderTree ) - : ASWizPage( parent, name ) + : ASWizPage( tqparent, name ) { TQGridLayout *grid = new TQGridLayout( mLayout, 5, 1, KDialog::spacingHint() ); @@ -1135,8 +1135,8 @@ void ASWizVirusRulesPage::processSelectionChange() //--------------------------------------------------------------------------- -ASWizSummaryPage::ASWizSummaryPage( TQWidget * parent, const char * name ) - : ASWizPage( parent, name ) +ASWizSummaryPage::ASWizSummaryPage( TQWidget * tqparent, const char * name ) + : ASWizPage( tqparent, name ) { TQBoxLayout * tqlayout = new TQVBoxLayout( mLayout ); -- cgit v1.2.3