From 98b2df119414b8333655224081c294a9ac144b37 Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Thu, 4 Feb 2010 16:32:54 +0000 Subject: [PATCH] Put everything in messageviewer/ into the MessageViewer namespace: - less risk of symbol collisions across libraries - the API docs of messageviewer link more correctly svn path=/trunk/KDE/kdepim/messageviewer/; revision=1085208 --- antispamwizard.cpp | 2 +- collectionaclpage.cpp | 9 +++++---- configuredialog.cpp | 6 +++--- filterimporterexporter.cpp | 2 +- filterlogdlg.cpp | 2 +- folderrequester.cpp | 3 ++- keyresolver.cpp | 4 ++-- kmcommands.cpp | 34 +++++++++++++++++----------------- kmcomposewin.cpp | 2 +- kmlineeditspell.cpp | 2 +- kmmainwidget.cpp | 22 +++++++++++----------- kmreaderwin.cpp | 1 - kmstartup.cpp | 2 +- messagehelper.cpp | 2 +- recipientseditor.cpp | 2 +- redirectdialog.cpp | 2 +- rulewidgethandlermanager.cpp | 2 +- snippetwidget.cpp | 12 ++++++------ 18 files changed, 56 insertions(+), 55 deletions(-) diff --git a/antispamwizard.cpp b/antispamwizard.cpp index 4bd5db90e..18c5760f4 100644 --- a/antispamwizard.cpp +++ b/antispamwizard.cpp @@ -498,7 +498,7 @@ void AntiSpamWizard::checkVirusRulesSelections() void AntiSpamWizard::checkToolAvailability() { // this can take some time to find the tools - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); bool found = false; for ( QList::Iterator it = mToolList.begin(); diff --git a/collectionaclpage.cpp b/collectionaclpage.cpp index 8e6b527a5..628dea8ef 100644 --- a/collectionaclpage.cpp +++ b/collectionaclpage.cpp @@ -137,7 +137,7 @@ void ACLEntryDialog::slotChanged() void ACLEntryDialog::slotSelectAddresses() { - AutoQPointer dlg( new KPIM::AddressesDialog( this ) ); + MessageViewer::AutoQPointer dlg( new KPIM::AddressesDialog( this ) ); dlg->setShowCC( false ); dlg->setShowBCC( false ); dlg->setSelectedTo( userIds() ); @@ -429,8 +429,8 @@ void CollectionAclPage::slotEditACL(QTreeWidgetItem* item) if ( !canAdmin ) return; ListViewItem* ACLitem = static_cast( mListView->currentItem() ); - AutoQPointer dlg( new ACLEntryDialog( i18n( "Modify Permissions" ), - this ) ); + MessageViewer::AutoQPointer dlg( new ACLEntryDialog( i18n( "Modify Permissions" ), + this ) ); dlg->setValues( ACLitem->userId(), ACLitem->permissions() ); if ( dlg->exec() == QDialog::Accepted && dlg ) { QStringList userIds = dlg->userIds(); @@ -464,7 +464,8 @@ void CollectionAclPage::addACLs( const QStringList& userIds, KIMAP::Acl::Rights void CollectionAclPage::slotAddACL() { - AutoQPointer dlg( new ACLEntryDialog( i18n( "Add Permissions" ), this ) ); + MessageViewer::AutoQPointer dlg( new ACLEntryDialog( i18n( "Add Permissions" ), + this ) ); if ( dlg->exec() == QDialog::Accepted && dlg ) { const QStringList userIds = dlg->userIds(); addACLs( dlg->userIds(), dlg->permissions() ); diff --git a/configuredialog.cpp b/configuredialog.cpp index 5e5c504ff..e5ea6f6b9 100644 --- a/configuredialog.cpp +++ b/configuredialog.cpp @@ -40,7 +40,6 @@ #include "identitylistview.h" using KMail::IdentityListView; using KMail::IdentityListViewItem; -#include "messageviewer/kcursorsaver.h" #include "folderrequester.h" using KMail::FolderRequester; #include "kmmainwidget.h" @@ -339,7 +338,8 @@ void IdentityPage::slotNewIdentity() Q_ASSERT( !mIdentityDialog ); KPIMIdentities::IdentityManager *im = kmkernel->identityManager(); - AutoQPointer dialog( new NewIdentityDialog( im->shadowIdentities(), this ) ); + MessageViewer::AutoQPointer dialog( new NewIdentityDialog( + im->shadowIdentities(), this ) ); dialog->setObjectName( "new" ); if ( dialog->exec() == QDialog::Accepted && dialog ) { @@ -2741,7 +2741,7 @@ void ComposerPage::GeneralTab::save() void ComposerPage::GeneralTab::slotConfigureRecentAddresses() { - AutoQPointer dlg( new KPIM::RecentAddressDialog( this ) ); + MessageViewer::AutoQPointer dlg( new KPIM::RecentAddressDialog( this ) ); dlg->setAddresses( RecentAddresses::self( KMKernel::config().data() )->addresses() ); if ( dlg->exec() && dlg ) { RecentAddresses::self( KMKernel::config().data() )->clear(); diff --git a/filterimporterexporter.cpp b/filterimporterexporter.cpp index 05c7e31eb..9c85c09a5 100644 --- a/filterimporterexporter.cpp +++ b/filterimporterexporter.cpp @@ -224,7 +224,7 @@ void FilterImporterExporter::exportFilters(const QList &filters ) return; KSharedConfig::Ptr config = KSharedConfig::openConfig( saveUrl.toLocalFile() ); - AutoQPointer dlg( new FilterSelectionDialog( mParent ) ); + MessageViewer::AutoQPointer dlg( new FilterSelectionDialog( mParent ) ); dlg->setFilters( filters ); if ( dlg->exec() == QDialog::Accepted && dlg ) writeFiltersToConfig( dlg->selectedFilters(), config, mPopFilter ); diff --git a/filterlogdlg.cpp b/filterlogdlg.cpp index 6c767d2e8..410525368 100644 --- a/filterlogdlg.cpp +++ b/filterlogdlg.cpp @@ -250,7 +250,7 @@ void FilterLogDialog::slotUser2() { QString fileName; KUrl url; - AutoQPointer fdlg( new KFileDialog( url, QString(), this) ); + MessageViewer::AutoQPointer fdlg( new KFileDialog( url, QString(), this) ); fdlg->setMode( KFile::File ); fdlg->setSelection( "kmail-filter.log" ); diff --git a/folderrequester.cpp b/folderrequester.cpp index 8120173b2..e71050de0 100644 --- a/folderrequester.cpp +++ b/folderrequester.cpp @@ -72,7 +72,8 @@ FolderRequester::FolderRequester( QWidget *parent ) //----------------------------------------------------------------------------- void FolderRequester::slotOpenDialog() { - AutoQPointer dlg( new FolderSelectionTreeViewDialog( this ) ); + MessageViewer::AutoQPointer dlg( + new FolderSelectionTreeViewDialog( this ) ); dlg->setCaption( i18n("Select Folder") ); dlg->setModal( false ); dlg->setSelectedCollection( mCollection ); diff --git a/keyresolver.cpp b/keyresolver.cpp index 583ceb88f..1445e52be 100644 --- a/keyresolver.cpp +++ b/keyresolver.cpp @@ -1439,7 +1439,7 @@ Kpgp::Result Kleo::KeyResolver::showKeyApprovalDialog() { std::copy( d->mSMIMEEncryptToSelfKeys.begin(), d->mSMIMEEncryptToSelfKeys.end(), std::back_inserter( senderKeys ) ); - const KCursorSaver idle( KBusyPtr::idle() ); + const MessageViewer::KCursorSaver idle( MessageViewer::KBusyPtr::idle() ); Kleo::KeyApprovalDialog dlg( items, senderKeys ); @@ -1512,7 +1512,7 @@ Kpgp::Result Kleo::KeyResolver::showKeyApprovalDialog() { : i18n("You did not select encryption keys for some of " "the recipients: these persons will not be able to " "decrypt the message if you encrypt it." ); - KCursorSaver idle( KBusyPtr::idle() ); + MessageViewer::KCursorSaver idle( MessageViewer::KBusyPtr::idle() ); if ( KMessageBox::warningContinueCancel( 0, msg, i18n("Missing Key Warning"), KGuiItem(i18n("&Encrypt")) ) diff --git a/kmcommands.cpp b/kmcommands.cpp index 40cca6e9a..b51e400ed 100644 --- a/kmcommands.cpp +++ b/kmcommands.cpp @@ -993,7 +993,7 @@ KMReplyToCommand::KMReplyToCommand( QWidget *parent, const Akonadi::Item &msg, KMCommand::Result KMReplyToCommand::execute() { - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); Akonadi::Item item = retrievedMessage(); if ( !item.isValid() ) { return Failed; @@ -1019,7 +1019,7 @@ KMNoQuoteReplyToCommand::KMNoQuoteReplyToCommand( QWidget *parent, KMCommand::Result KMNoQuoteReplyToCommand::execute() { - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); Akonadi::Item item = retrievedMessage(); if ( !item.isValid() ) { return Failed; @@ -1046,7 +1046,7 @@ KMReplyListCommand::KMReplyListCommand( QWidget *parent, KMCommand::Result KMReplyListCommand::execute() { - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); Akonadi::Item item = retrievedMessage(); if ( !item.isValid() ) { return Failed; @@ -1074,7 +1074,7 @@ KMReplyToAllCommand::KMReplyToAllCommand( QWidget *parent, KMCommand::Result KMReplyToAllCommand::execute() { - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); Akonadi::Item item = retrievedMessage(); if ( !item.isValid() ) { return Failed; @@ -1103,7 +1103,7 @@ KMReplyAuthorCommand::KMReplyAuthorCommand( QWidget *parent, const Akonadi::Item KMCommand::Result KMReplyAuthorCommand::execute() { - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); Akonadi::Item item = retrievedMessage(); if ( !item.isValid() ) { return Failed; @@ -1215,7 +1215,7 @@ KMCommand::Result KMForwardCommand::execute() msgPart->setContentDescription(QString("Digest of %1 messages.").arg(msgCnt)); // THIS HAS TO BE AFTER setCte()!!!! msgPart->setBodyEncoded(msgPartText.toAscii()); - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy(MessageViewer::KBusyPtr::busy()); KMail::Composer * win = KMail::makeComposer( fwdMsg, KMail::Composer::NoTemplate, id ); win->addAttach(msgPart); win->show(); @@ -1252,7 +1252,7 @@ KMCommand::Result KMForwardCommand::execute() } } - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); KMail::Composer * win = KMail::makeComposer( fwdMsg, KMail::Composer::NoTemplate, id ); win->show(); return OK; @@ -1270,7 +1270,7 @@ KMCommand::Result KMForwardCommand::execute() KMime::Message::Ptr msg = KMail::Util::message( item ); if ( !msg ) return Failed; - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); KMime::Message::Ptr fwdMsg( KMail::MessageHelper::createForward(item, msg) ); uint id = msg->headerByType( "X-KMail-Identity" ) ? msg->headerByType("X-KMail-Identity")->asUnicodeString().trimmed().toUInt() : 0; @@ -1322,7 +1322,7 @@ KMCommand::Result KMForwardAttachedCommand::execute() fwdMsg->subject()->fromUnicodeString( KMail::MessageHelper::forwardSubject(msg),"utf-8" ); } KMail::MessageHelper::setAutomaticFields(fwdMsg, true); - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); if (!mWin) mWin = KMail::makeComposer(fwdMsg, KMail::Composer::Forward, mIdentity); // iterate through all the messages to be forwarded @@ -1374,8 +1374,8 @@ KMCommand::Result KMRedirectCommand::execute() if ( !item.isValid() ) { return Failed; } - AutoQPointer dlg( new RedirectDialog( parentWidget(), - kmkernel->msgSender()->sendImmediate() ) ); + MessageViewer::AutoQPointer dlg( + new RedirectDialog( parentWidget(), kmkernel->msgSender()->sendImmediate() ) ); dlg->setObjectName( "redirect" ); if ( dlg->exec() == QDialog::Rejected || !dlg ) { return Failed; @@ -1409,7 +1409,7 @@ KMCustomReplyToCommand::KMCustomReplyToCommand( QWidget *parent, const Akonadi:: KMCommand::Result KMCustomReplyToCommand::execute() { - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); Akonadi::Item item = retrievedMessage(); if ( !item.isValid() ) { return Failed; @@ -1440,7 +1440,7 @@ KMCustomReplyAllToCommand::KMCustomReplyAllToCommand( QWidget *parent, const Ako KMCommand::Result KMCustomReplyAllToCommand::execute() { - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); Akonadi::Item item = retrievedMessage(); if ( !item.isValid() ) { return Failed; @@ -1516,7 +1516,7 @@ KMCommand::Result KMCustomForwardCommand::execute() } } - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); KMail::Composer * win = KMail::makeComposer( fwdMsg, KMail::Composer::Forward, id, QString(), mTemplate ); win->show(); @@ -1529,7 +1529,7 @@ KMCommand::Result KMCustomForwardCommand::execute() KMime::Message::Ptr msg = KMail::Util::message( item ); if ( !msg ) return Failed; - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); KMime::Message::Ptr fwdMsg = KMail::MessageHelper::createForward( item, msg, mTemplate ); uint id = 0; @@ -1726,7 +1726,7 @@ KMFilterActionCommand::KMFilterActionCommand( QWidget *parent, KMCommand::Result KMFilterActionCommand::execute() { - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); int msgCount = 0; int msgCountToFilter = retrievedMsgs().size(); @@ -1904,7 +1904,7 @@ void KMMoveCommand::slotMoveResult( KJob * job ) KMCommand::Result KMMoveCommand::execute() { - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); setEmitsCompletedItself( true ); setDeletesItself( true ); diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp index 14b76bfd7..307055bda 100644 --- a/kmcomposewin.cpp +++ b/kmcomposewin.cpp @@ -3183,7 +3183,7 @@ void KMComposeWin::doSend( KMail::MessageSender::SendMethod method, } } - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); mMsg->date()->setDateTime( KDateTime::currentLocalDateTime() ); mMsg->setHeader( new KMime::Headers::Generic( "X-KMail-Transport", mMsg.get(), mTransport->currentText(), "utf-8" ) ); diff --git a/kmlineeditspell.cpp b/kmlineeditspell.cpp index 9681378e3..9c38dbdea 100644 --- a/kmlineeditspell.cpp +++ b/kmlineeditspell.cpp @@ -178,7 +178,7 @@ void KMLineEdit::contextMenuEvent( QContextMenuEvent*e ) void KMLineEdit::editRecentAddresses() { - AutoQPointer dlg( new KPIM::RecentAddressDialog( this ) ); + MessageViewer::AutoQPointer dlg( new KPIM::RecentAddressDialog( this ) ); dlg->setAddresses( KPIM::RecentAddresses::self( KMKernel::config().data() )->addresses() ); if ( dlg->exec() && dlg ) { KPIM::RecentAddresses::self( KMKernel::config().data() )->clear(); diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index 058aeedeb..51c3a462f 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -364,7 +364,7 @@ void KMMainWidget::folderSelected( const Akonadi::Collection & col, bool forceJu } } - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); if (mMsgView) mMsgView->clear(true); @@ -1475,7 +1475,7 @@ void KMMainWidget::slotFolderShortcutCommand() if ( !mCollectionFolderView || !mCurrentFolder ) return; - AutoQPointer shorty; + MessageViewer::AutoQPointer shorty; shorty = new KMail::FolderShortcutDialog( mCurrentFolder, kmkernel->getKMMainWidget(), mCollectionFolderView ); shorty->exec(); //slotModifyFolder( KMMainWidget::PropsShortcut ); @@ -1541,7 +1541,7 @@ void KMMainWidget::slotEmptyFolder() if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem( title, "user-trash")) != KMessageBox::Continue) return; } - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); slotMarkAll(); if (isTrash) { /* Don't ask for confirmation again when deleting, the user has already @@ -1654,7 +1654,7 @@ void KMMainWidget::slotCompactFolder() if (!mCurrentFolder) return; - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); mCurrentFolder->compact( FolderCollection::CompactNow ); } @@ -1720,7 +1720,7 @@ void KMMainWidget::slotExpireAll() //----------------------------------------------------------------------------- void KMMainWidget::slotCompactAll() { - KCursorSaver busy(KBusyPtr::busy()); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); kmkernel->compactAllFolders(); } @@ -1926,7 +1926,7 @@ void KMMainWidget::slotDeleteThread( bool confirmDelete ) void KMMainWidget::slotMoveSelectedMessageToFolder() { - AutoQPointer dlg; + MessageViewer::AutoQPointer dlg; dlg = new FolderSelectionTreeViewDialog( this ); dlg->setModal( true ); dlg->setCaption( i18n( "Move Messages to Folder" ) ); @@ -1980,7 +1980,7 @@ void KMMainWidget::slotCopyMessagesCompleted( KMCommand *command ) void KMMainWidget::slotCopySelectedMessagesToFolder() { - AutoQPointer dlg; + MessageViewer::AutoQPointer dlg; dlg = new FolderSelectionTreeViewDialog( this ); dlg->setModal( true ); dlg->setCaption( i18n( "Copy Messages to Folder" ) ); @@ -2302,7 +2302,7 @@ void KMMainWidget::slotUndo() void KMMainWidget::slotJumpToFolder() { // can jump to anywhere, need not be read/write - AutoQPointer dlg; + MessageViewer::AutoQPointer dlg; dlg = new FolderSelectionTreeViewDialog( this,false ); dlg->setCaption( i18n( "Jump to Folder") ); if ( dlg->exec() && dlg ) { @@ -2343,7 +2343,7 @@ void KMMainWidget::slotApplyFilters() return; } - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); const int msgCountToFilter = selectedMessages.size(); mFilterProgressItem = KPIM::ProgressManager::createProgressItem ( @@ -3660,14 +3660,14 @@ void KMMainWidget::slotCollapseThread() void KMMainWidget::slotExpandAllThreads() { // TODO: Make this asynchronous ? (if there is enough demand) - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); mMessagePane->setAllThreadsExpanded( true ); } void KMMainWidget::slotCollapseAllThreads() { // TODO: Make this asynchronous ? (if there is enough demand) - KCursorSaver busy( KBusyPtr::busy() ); + MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() ); mMessagePane->setAllThreadsExpanded( false ); } diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp index 0e2dd39d9..1348875a2 100644 --- a/kmreaderwin.cpp +++ b/kmreaderwin.cpp @@ -39,7 +39,6 @@ #include #include #include "messagesender.h" -#include "messageviewer/kcursorsaver.h" #include "messageviewer/headerstrategy.h" #include "messageviewer/headerstyle.h" #include "messageviewer/mailwebview.h" diff --git a/kmstartup.cpp b/kmstartup.cpp index e790f65c1..af47f8ef9 100644 --- a/kmstartup.cpp +++ b/kmstartup.cpp @@ -221,7 +221,7 @@ void lockOrDie() { oldProgramName, programName, oldHostName ); } - KCursorSaver idle( KBusyPtr::idle() ); + MessageViewer::KCursorSaver idle( MessageViewer::KBusyPtr::idle() ); if ( KMessageBox::No == KMessageBox::warningYesNo( 0, msg, QString(), KGuiItem(i18nc("Start kmail even when another instance is running.", "Start %1", programName )), diff --git a/messagehelper.cpp b/messagehelper.cpp index fa20953dd..19da48e09 100644 --- a/messagehelper.cpp +++ b/messagehelper.cpp @@ -92,7 +92,7 @@ static const int numMdnMessageBoxes static int requestAdviceOnMDN( const char * what ) { for ( int i = 0 ; i < numMdnMessageBoxes ; ++i ) if ( !qstrcmp( what, mdnMessageBoxes[i].dontAskAgainID ) ) { - const KCursorSaver saver( Qt::ArrowCursor ); + const MessageViewer::KCursorSaver saver( Qt::ArrowCursor ); MDNAdviceDialog::MDNAdvice answer; answer = MDNAdviceDialog::questionIgnoreSend( mdnMessageBoxes[i].text, mdnMessageBoxes[i].canDeny ); diff --git a/recipientseditor.cpp b/recipientseditor.cpp index 6214bd2bb..ec6b7c8ee 100644 --- a/recipientseditor.cpp +++ b/recipientseditor.cpp @@ -911,7 +911,7 @@ void RecipientsEditor::slotPickedRecipient( const Recipient &rec ) void RecipientsEditor::saveDistributionList() { - AutoQPointer dlg( new DistributionListDialog( this ) ); + MessageViewer::AutoQPointer dlg( new DistributionListDialog( this ) ); dlg->setRecipients( mRecipientsView->recipients() ); dlg->exec(); } diff --git a/redirectdialog.cpp b/redirectdialog.cpp index 3fab7551d..10bc1e84d 100644 --- a/redirectdialog.cpp +++ b/redirectdialog.cpp @@ -129,7 +129,7 @@ void RedirectDialog::accept() //----------------------------------------------------------------------------- void RedirectDialog::slotAddrBook() { - AutoQPointer dlg( new AddressesDialog( this ) ); + MessageViewer::AutoQPointer dlg( new AddressesDialog( this ) ); mResentTo = mEditTo->text(); if ( !mResentTo.isEmpty() ) { diff --git a/rulewidgethandlermanager.cpp b/rulewidgethandlermanager.cpp index 19356c86f..010a42eb1 100644 --- a/rulewidgethandlermanager.cpp +++ b/rulewidgethandlermanager.cpp @@ -238,7 +238,7 @@ KMail::RuleWidgetHandlerManager::RuleWidgetHandlerManager() KMail::RuleWidgetHandlerManager::~RuleWidgetHandlerManager() { for_each( mHandlers.begin(), mHandlers.end(), - DeleteAndSetToZero() ); + MessageViewer::DeleteAndSetToZero() ); } void KMail::RuleWidgetHandlerManager::registerHandler( const RuleWidgetHandler * handler ) diff --git a/snippetwidget.cpp b/snippetwidget.cpp index dd514d1a6..7f821a02d 100644 --- a/snippetwidget.cpp +++ b/snippetwidget.cpp @@ -99,7 +99,7 @@ SnippetWidget::~SnippetWidget() void SnippetWidget::slotAdd() { //kDebug() << "Ender slotAdd()"; - AutoQPointer dlg( new SnippetDlg( mActionCollection, this ) ); + MessageViewer::AutoQPointer dlg( new SnippetDlg( mActionCollection, this ) ); dlg->setObjectName( "SnippetDlg" ); /*check if the user clicked a SnippetGroup @@ -163,7 +163,7 @@ SnippetItem* SnippetWidget::makeItem( SnippetItem *parent, const QString &name, void SnippetWidget::slotAddGroup() { //kDebug() << "Ender slotAddGroup()"; - AutoQPointer dlg( new SnippetDlg( mActionCollection, this ) ); + MessageViewer::AutoQPointer dlg( new SnippetDlg( mActionCollection, this ) ); dlg->setObjectName( "SnippetDlg" ); dlg->setGroupMode( true ); dlg->setWindowTitle( i18n("Add Group") ); @@ -221,7 +221,7 @@ void SnippetWidget::slotEdit( QTreeWidgetItem* item ) return; //init the dialog - AutoQPointer dlg( new SnippetDlg( mActionCollection, this ) ); + MessageViewer::AutoQPointer dlg( new SnippetDlg( mActionCollection, this ) ); dlg->setObjectName( "SnippetDlg" ); dlg->snippetName->setText(pSnippet->getName()); dlg->snippetText->setText(pSnippet->getText()); @@ -274,7 +274,7 @@ void SnippetWidget::slotEditGroup() return; //init the dialog - AutoQPointer dlg( new SnippetDlg( mActionCollection, this ) ); + MessageViewer::AutoQPointer dlg( new SnippetDlg( mActionCollection, this ) ); dlg->setObjectName( "SnippetDlg" ); dlg->setGroupMode( true ); dlg->snippetName->setText(pGroup->getName()); @@ -555,7 +555,7 @@ QString SnippetWidget::parseText( const QString &text ) QString SnippetWidget::showSingleVarDialog( const QString &var, QMap *mapSave ) { // --BEGIN-- building a dynamic dialog - AutoQPointer dlg( new QDialog( this ) ); // don't fix this krazy issues without actually trying the code! + MessageViewer::AutoQPointer dlg( new QDialog( this ) ); // don't fix this krazy issues without actually trying the code! dlg->setWindowTitle(i18n("Enter Values for Variables")); QGridLayout * layout = new QGridLayout( dlg ); @@ -708,7 +708,7 @@ void SnippetWidget::dropEvent( QDropEvent * event ) } // fill the dialog with the given data - AutoQPointer dlg( new SnippetDlg( mActionCollection, this ) ); + MessageViewer::AutoQPointer dlg( new SnippetDlg( mActionCollection, this ) ); dlg->setObjectName( "SnippetDlg" ); dlg->snippetName->clear(); dlg->snippetText->setText( event->mimeData()->text() );