From 1ffb0ec14aa63eb6945e50dcf03045763943cbf9 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sat, 2 Apr 2016 14:51:44 +0200 Subject: [PATCH] Move method in cpp file --- kmail/kmreaderwin.cpp | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ kmail/kmreaderwin.h | 69 +++++++++++---------------------------------------- 2 files changed, 80 insertions(+), 54 deletions(-) diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 22d8822095..6f7fc3939a 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -238,6 +238,11 @@ void KMReaderWin::setUseFixedFont(bool useFixedFont) mViewer->setUseFixedFont(useFixedFont); } +Viewer *KMReaderWin::viewer() +{ + return mViewer; +} + bool KMReaderWin::isFixedFont() const { return mViewer->isFixedFont(); @@ -426,6 +431,11 @@ Akonadi::Item KMReaderWin::message() const return mViewer->messageItem(); } +QWidget *KMReaderWin::mainWindow() +{ + return mMainWindow; +} + void KMReaderWin::slotMailtoCompose() { KMCommand *command = new KMMailtoComposeCommand(urlClicked(), message()); @@ -546,6 +556,31 @@ KToggleAction *KMReaderWin::toggleFixFontAction() const return mViewer->toggleFixFontAction(); } +QAction *KMReaderWin::mailToComposeAction() const +{ + return mMailToComposeAction; +} + +QAction *KMReaderWin::mailToReplyAction() const +{ + return mMailToReplyAction; +} + +QAction *KMReaderWin::mailToForwardAction() const +{ + return mMailToForwardAction; +} + +QAction *KMReaderWin::addAddrBookAction() const +{ + return mAddAddrBookAction; +} + +QAction *KMReaderWin::openAddrBookAction() const +{ + return mOpenAddrBookAction; +} + bool KMReaderWin::mimePartTreeIsEmpty() const { return mViewer->mimePartTreeIsEmpty(); @@ -605,6 +640,16 @@ QAction *KMReaderWin::urlOpenAction() const { return mViewer->urlOpenAction(); } + +QAction *KMReaderWin::urlSaveAsAction() const +{ + return mUrlSaveAsAction; +} + +QAction *KMReaderWin::addBookmarksAction() const +{ + return mAddBookmarksAction; +} void KMReaderWin::setPrinting(bool enable) { mViewer->setPrinting(enable); @@ -831,6 +876,26 @@ QAction *KMReaderWin::openBlockableItems() const return mViewer->openBlockableItems(); } +QAction *KMReaderWin::editContactAction() const +{ + return mEditContactAction; +} + +QMenu *KMReaderWin::viewHtmlOption() const +{ + return mViewHtmlOptions; +} + +QAction *KMReaderWin::shareImage() const +{ + return mShareImage; +} + +QAction *KMReaderWin::addToExistingContactAction() const +{ + return mAddEmailToExistingContactAction; +} + void KMReaderWin::slotShareImage() { KMCommand *command = new KMShareImageCommand(imageUrlClicked(), this); diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index c3b5c3eaac..2587d389a0 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -125,44 +125,20 @@ public: bool isFixedFont() const; void setUseFixedFont(bool useFixedFont); - MessageViewer::Viewer *viewer() - { - return mViewer; - } + MessageViewer::Viewer *viewer(); KToggleAction *toggleFixFontAction() const; - QAction *mailToComposeAction() const - { - return mMailToComposeAction; - } - QAction *mailToReplyAction() const - { - return mMailToReplyAction; - } - QAction *mailToForwardAction() const - { - return mMailToForwardAction; - } - QAction *addAddrBookAction() const - { - return mAddAddrBookAction; - } - QAction *openAddrBookAction() const - { - return mOpenAddrBookAction; - } + QAction *mailToComposeAction() const; + QAction *mailToReplyAction() const; + QAction *mailToForwardAction() const; + QAction *addAddrBookAction() const; + QAction *openAddrBookAction() const; QAction *copyAction() const; QAction *selectAllAction() const; QAction *copyURLAction() const; QAction *copyImageLocation() const; QAction *urlOpenAction() const; - QAction *urlSaveAsAction() const - { - return mUrlSaveAsAction; - } - QAction *addBookmarksAction() const - { - return mAddBookmarksAction; - } + QAction *urlSaveAsAction() const; + QAction *addBookmarksAction() const; QAction *toggleMimePartTreeAction() const; QAction *speakTextAction() const; QAction *downloadImageToDiskAction() const; @@ -174,31 +150,16 @@ public: QAction *blockImage() const; QAction *openBlockableItems() const; - QAction *editContactAction() const - { - return mEditContactAction; - } - - QMenu *viewHtmlOption() const - { - return mViewHtmlOptions; - } - QAction *shareImage() const - { - return mShareImage; - } - - QAction *addToExistingContactAction() const - { - return mAddEmailToExistingContactAction; - } + QAction *editContactAction() const; + + QMenu *viewHtmlOption() const; + QAction *shareImage() const; + + QAction *addToExistingContactAction() const; Akonadi::Item message() const; - QWidget *mainWindow() - { - return mMainWindow; - } + QWidget *mainWindow(); /** Enforce message decryption. */ void setDecryptMessageOverwrite(bool overwrite = true); -- 2.11.4.GIT