wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deprecated: QMenu::insertSeparator() -> QMenu::addSeparator(), QBitmap(w,h,bool) -> QBitmap(w,h) and QBitmap::clear()

Browse Source 
svn path=/trunk/KDE/kdepim/; revision=531904
wilder-work
Reinhold Kainhofer 20 years ago
parent b53307e9f0
commit 1a753fd376
11 changed files with 37 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      headeritem.cpp
  2. 2
      kmcommands.cpp
  3. 8
      kmcomposewin.cpp
  4. 2
      kmfolderseldlg.cpp
  5. 10
      kmfoldertree.cpp
  6. 10
      kmheaders.cpp
  7. 2
      kmlineeditspell.cpp
  8. 18
      kmmainwidget.cpp
  9. 10
      kmreadermainwin.cpp
  10. 4
      kmsystemtray.cpp
  11. 4
      searchwindow.cpp

3
headeritem.cpp
Unescape View File

@ -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();

2
kmcommands.cpp
Unescape View File

@ -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)

8
kmcomposewin.cpp
Unescape View File

@ -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()));
}

2
kmfolderseldlg.cpp
Unescape View File

@ -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()));

10
kmfoldertree.cpp
Unescape View File

@ -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() ) {

10
kmheaders.cpp
Unescape View File

@ -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() )

2
kmlineeditspell.cpp
Unescape View File

@ -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;

18
kmmainwidget.cpp
Unescape View File

@ -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());
}

10
kmreadermainwin.cpp
Unescape View File

@ -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()) );

4
kmsystemtray.cpp
Unescape View File

@ -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<KMainWindow*>(kmkernel->getKMMainWidget()->topLevelWidget());
if(mainWin)

4
searchwindow.cpp
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save