From 1a753fd376fbbc950d686c8d24cfd88b698309af Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Thu, 20 Apr 2006 15:50:20 +0000 Subject: [PATCH] deprecated: QMenu::insertSeparator() -> QMenu::addSeparator(), QBitmap(w,h,bool) -> QBitmap(w,h) and QBitmap::clear() svn path=/trunk/KDE/kdepim/; revision=531904 --- headeritem.cpp | 3 ++- kmcommands.cpp | 2 +- kmcomposewin.cpp | 8 ++++---- kmfolderseldlg.cpp | 2 +- kmfoldertree.cpp | 10 +++++----- kmheaders.cpp | 10 +++++----- kmlineeditspell.cpp | 2 +- kmmainwidget.cpp | 18 +++++++++--------- kmreadermainwin.cpp | 10 +++++----- kmsystemtray.cpp | 4 ++-- searchwindow.cpp | 4 ++-- 11 files changed, 37 insertions(+), 36 deletions(-) diff --git a/headeritem.cpp b/headeritem.cpp index cf8993f8f..bacbe2dde 100644 --- a/headeritem.cpp +++ b/headeritem.cpp @@ -212,7 +212,8 @@ QPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const } QPixmap res( width, height ); - QBitmap mask( width, height, true ); + QBitmap mask( width, height ); + mask.clear(); int x = 0; for ( PixmapList::ConstIterator it = pixmaps.begin(); diff --git a/kmcommands.cpp b/kmcommands.cpp index 4b45db6b2..22d930861 100644 --- a/kmcommands.cpp +++ b/kmcommands.cpp @@ -1664,7 +1664,7 @@ void KMMenuCommand::makeFolderMenu(KMFolderNode* node, bool move, menuId = menu->insertItem(i18n("Copy to This Folder")); aMenuToFolder->insert( menuId, folder ); menu->setItemEnabled( menuId, !folder->isReadOnly() ); - menu->insertSeparator(); + menu->addSeparator(); } if (!folderDir) diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp index 0275bd4a2..e91ce4ae8 100644 --- a/kmcomposewin.cpp +++ b/kmcomposewin.cpp @@ -1513,16 +1513,16 @@ void KMComposeWin::setupEditor(void) SLOT(undo()), KStdAccel::shortcut(KStdAccel::Undo)); menu->insertItem(i18n("Redo"),mEditor, SLOT(redo()), KStdAccel::shortcut(KStdAccel::Redo)); - menu->insertSeparator(); + menu->addSeparator(); //#endif //BROKEN menu->insertItem(i18n("Cut"), this, SLOT(slotCut())); menu->insertItem(i18n("Copy"), this, SLOT(slotCopy())); menu->insertItem(i18n("Paste"), this, SLOT(slotPaste())); menu->insertItem(i18n("Mark All"),this, SLOT(slotMarkAll())); - menu->insertSeparator(); + menu->addSeparator(); menu->insertItem(i18n("Find..."), this, SLOT(slotFind())); menu->insertItem(i18n("Replace..."), this, SLOT(slotReplace())); - menu->insertSeparator(); + menu->addSeparator(); menu->insertItem(i18n("Fixed Font Widths"), this, SLOT(slotUpdateFont())); mEditor->installRBPopup(menu); */ @@ -2909,7 +2909,7 @@ void KMComposeWin::slotAttachPopupMenu(Q3ListViewItem *, const QPoint &, int) SLOT( slotAttachSave() ) ); mPropertiesId = mAttachMenu->addAction( i18n("Properties"), this, SLOT( slotAttachProperties() ) ); - mAttachMenu->insertSeparator(); + mAttachMenu->addSeparator(); mAttachMenu->addAction(i18n("Add Attachment..."), this, SLOT(slotAttachFile())); } diff --git a/kmfolderseldlg.cpp b/kmfolderseldlg.cpp index 50d22c3e2..a569db3d8 100644 --- a/kmfolderseldlg.cpp +++ b/kmfolderseldlg.cpp @@ -216,7 +216,7 @@ void SimpleFolderTree::slotContextMenuRequested( Q3ListViewItem *lvi, KMenu *folderMenu = new KMenu; folderMenu->addTitle( folder->label() ); - folderMenu->insertSeparator(); + folderMenu->addSeparator(); folderMenu->insertItem(SmallIconSet("folder_new"), i18n("&New Subfolder..."), this, SLOT(addChildFolder())); diff --git a/kmfoldertree.cpp b/kmfoldertree.cpp index 25d298f7a..2dd016e4c 100644 --- a/kmfoldertree.cpp +++ b/kmfoldertree.cpp @@ -1009,7 +1009,7 @@ void KMFolderTree::slotContextMenuRequested( Q3ListViewItem *lvi, } } else { // regular folders - folderMenu->insertSeparator(); + folderMenu->addSeparator(); if ( !fti->folder()->noChildren() ) { folderMenu->insertItem(SmallIconSet("folder_new"), i18n("&New Subfolder..."), this, @@ -1032,13 +1032,13 @@ void KMFolderTree::slotContextMenuRequested( Q3ListViewItem *lvi, mMainWidget->action("compact")->plug(folderMenu); - folderMenu->insertSeparator(); + folderMenu->addSeparator(); if ( !fti->folder()->isSystemFolder() ) { mMainWidget->action("delete_folder")->plug(folderMenu); - folderMenu->insertSeparator(); + folderMenu->addSeparator(); } mMainWidget->action("empty")->plug(folderMenu); - folderMenu->insertSeparator(); + folderMenu->addSeparator(); } } @@ -1065,7 +1065,7 @@ void KMFolderTree::slotContextMenuRequested( Q3ListViewItem *lvi, i18n("&Troubleshoot IMAP Cache..."), folder, SLOT(slotTroubleshoot()) ); } - folderMenu->insertSeparator(); + folderMenu->addSeparator(); } if ( fti->folder() && fti->folder()->isMailingListEnabled() ) { diff --git a/kmheaders.cpp b/kmheaders.cpp index b45757fba..fa0d44698 100644 --- a/kmheaders.cpp +++ b/kmheaders.cpp @@ -2303,7 +2303,7 @@ void KMHeaders::slotRMB() mOwner->sendAgainAction()->plug(menu); } } - menu->insertSeparator(); + menu->addSeparator(); Q3PopupMenu *msgCopyMenu = new Q3PopupMenu(menu); mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this, @@ -2319,7 +2319,7 @@ void KMHeaders::slotRMB() &mMenuToFolder, msgMoveMenu ); menu->insertItem(i18n("&Move To"), msgMoveMenu); } - menu->insertSeparator(); + menu->addSeparator(); mOwner->statusMenu()->plug( menu ); // Mark Message menu if ( mOwner->threadStatusMenu()->isEnabled() ) { mOwner->threadStatusMenu()->plug( menu ); // Mark Thread menu @@ -2331,16 +2331,16 @@ void KMHeaders::slotRMB() } if ( !out_folder ) { - menu->insertSeparator(); + menu->addSeparator(); mOwner->filterMenu()->plug( menu ); // Create Filter menu mOwner->action("apply_filter_actions")->plug(menu); } - menu->insertSeparator(); + menu->addSeparator(); mOwner->saveAsAction()->plug(menu); mOwner->saveAttachmentsAction()->plug(menu); mOwner->printAction()->plug(menu); - menu->insertSeparator(); + menu->addSeparator(); if ( mFolder->isTrash() ) { mOwner->deleteAction()->plug(menu); if ( mOwner->trashThreadAction()->isEnabled() ) diff --git a/kmlineeditspell.cpp b/kmlineeditspell.cpp index ee08f8f26..d79c364d8 100644 --- a/kmlineeditspell.cpp +++ b/kmlineeditspell.cpp @@ -129,7 +129,7 @@ void KMLineEdit::dropEvent(QDropEvent *event) void KMLineEdit::contextMenuEvent( QContextMenuEvent*e ) { QMenu *popup = KLineEdit::createStandardContextMenu(); - popup->insertSeparator(); + popup->addSeparator(); popup->insertItem( i18n( "Edit Recent Addresses..." ),this, SLOT( editRecentAddresses() ) ); popup->exec( e->globalPos() ); delete popup; diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index d4e097619..31012833f 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -2166,7 +2166,7 @@ void KMMainWidget::slotMsgPopup(KMMessage&, const KUrl &aUrl, const QPoint& aPoi mMsgView->mailToReplyAction()->plug( menu ); mMsgView->mailToForwardAction()->plug( menu ); - menu->insertSeparator(); + menu->addSeparator(); mMsgView->addAddrBookAction()->plug( menu ); mMsgView->openAddrBookAction()->plug( menu ); mMsgView->copyURLAction()->plug( menu ); @@ -2196,9 +2196,9 @@ void KMMainWidget::slotMsgPopup(KMMessage&, const KUrl &aUrl, const QPoint& aPoi if(mMsgView && !mMsgView->copyText().isEmpty()) { if ( urlMenuAdded ) - menu->insertSeparator(); + menu->addSeparator(); mReplyActionMenu->plug(menu); - menu->insertSeparator(); + menu->addSeparator(); mMsgView->copyAction()->plug( menu ); mMsgView->selectAllAction()->plug( menu ); @@ -2220,26 +2220,26 @@ void KMMainWidget::slotMsgPopup(KMMessage&, const KUrl &aUrl, const QPoint& aPoi mReplyActionMenu->plug(menu); mForwardActionMenu->plug(menu); } - menu->insertSeparator(); + menu->addSeparator(); mCopyActionMenu->plug( menu ); mMoveActionMenu->plug( menu ); - menu->insertSeparator(); + menu->addSeparator(); mStatusMenu->plug( menu ); - menu->insertSeparator(); + menu->addSeparator(); viewSourceAction()->plug(menu); if(mMsgView) { mMsgView->toggleFixFontAction()->plug(menu); } - menu->insertSeparator(); + menu->addSeparator(); mPrintAction->plug( menu ); mSaveAsAction->plug( menu ); mSaveAttachmentsAction->plug( menu ); - menu->insertSeparator(); + menu->addSeparator(); if( mFolder->isTrash() ) mDeleteAction->plug( menu ); else @@ -3349,7 +3349,7 @@ void KMMainWidget::initializeFilterActions() SLOT(start()), actionCollection(), normalizedName.toLocal8Bit()); if(!addedSeparator) { - mApplyFilterActionsMenu->popupMenu()->insertSeparator(); + mApplyFilterActionsMenu->popupMenu()->addSeparator(); addedSeparator = !addedSeparator; mFilterMenuActions.append( new KActionSeparator()); } diff --git a/kmreadermainwin.cpp b/kmreadermainwin.cpp index f1a245720..41f2e0c6e 100644 --- a/kmreadermainwin.cpp +++ b/kmreadermainwin.cpp @@ -325,7 +325,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KUrl &aUrl, const QPoi if ( mMsg ) { mReaderWin->mailToReplyAction()->plug( menu ); mReaderWin->mailToForwardAction()->plug( menu ); - menu->insertSeparator(); + menu->addSeparator(); } mReaderWin->addAddrBookAction()->plug( menu ); mReaderWin->openAddrBookAction()->plug( menu ); @@ -341,7 +341,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KUrl &aUrl, const QPoi } if(mReaderWin && !mReaderWin->copyText().isEmpty()) { if ( urlMenuAdded ) - menu->insertSeparator(); + menu->addSeparator(); mReaderWin->copyAction()->plug( menu ); mReaderWin->selectAllAction()->plug( menu ); } else if ( !urlMenuAdded ) @@ -357,7 +357,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KUrl &aUrl, const QPoi if( !aMsg.parent()->isSent() && !aMsg.parent()->isDrafts() ) { mReplyActionMenu->plug( menu ); mForwardActionMenu->plug( menu ); - menu->insertSeparator(); + menu->addSeparator(); } Q3PopupMenu* copyMenu = new Q3PopupMenu(menu); @@ -366,10 +366,10 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KUrl &aUrl, const QPoi mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this, &mMenuToFolder, copyMenu ); menu->insertItem( i18n("&Copy To" ), copyMenu ); - menu->insertSeparator(); + menu->addSeparator(); mViewSourceAction->plug( menu ); mReaderWin->toggleFixFontAction()->plug( menu ); - menu->insertSeparator(); + menu->addSeparator(); mPrintAction->plug( menu ); menu->insertItem( SmallIcon("filesaveas"), i18n( "Save &As..." ), mReaderWin, SLOT( slotSaveMsg() ) ); menu->insertItem( i18n("Save Attachments..."), mReaderWin, SLOT(slotSaveAttachments()) ); diff --git a/kmsystemtray.cpp b/kmsystemtray.cpp index a59898a2e..f9019b172 100644 --- a/kmsystemtray.cpp +++ b/kmsystemtray.cpp @@ -129,12 +129,12 @@ void KMSystemTray::buildPopupMenu() action->plug( mPopupMenu ); if ( ( action = mainWidget->action("send_queued_via") ) ) action->plug( mPopupMenu ); - mPopupMenu->insertSeparator(); + mPopupMenu->addSeparator(); if ( ( action = mainWidget->action("new_message") ) ) action->plug( mPopupMenu ); if ( ( action = mainWidget->action("kmail_configure_kmail") ) ) action->plug( mPopupMenu ); - mPopupMenu->insertSeparator(); + mPopupMenu->addSeparator(); KMainWindow *mainWin = ::qobject_cast(kmkernel->getKMMainWidget()->topLevelWidget()); if(mainWin) diff --git a/searchwindow.cpp b/searchwindow.cpp index d7709486d..067a3cbf8 100644 --- a/searchwindow.cpp +++ b/searchwindow.cpp @@ -738,13 +738,13 @@ void SearchWindow::slotContextMenuRequested( Q3ListViewItem *lvi, const QPoint & mReplyAllAction->plug(menu); mReplyListAction->plug(menu); mForwardActionMenu->plug(menu); - menu->insertSeparator(); + menu->addSeparator(); menu->insertItem(i18n("&Copy To"), msgCopyMenu); menu->insertItem(i18n("&Move To"), msgMoveMenu); mSaveAsAction->plug(menu); mSaveAtchAction->plug(menu); mPrintAction->plug(menu); - menu->insertSeparator(); + menu->addSeparator(); mClearAction->plug(menu); menu->exec (QCursor::pos(), 0); delete menu;