From afffb2918b85011e702466695e5b56a2511548a8 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 5 Mar 2015 13:51:22 +0100
Subject: [PATCH] mousePopupMenuImplementation doesn't exist now

---
 editor/kmcomposereditor.cpp | 8 +++-----
 editor/kmcomposereditor.h   | 7 +++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/editor/kmcomposereditor.cpp b/editor/kmcomposereditor.cpp
index c974a8d3e..96efd52dc 100644
--- a/editor/kmcomposereditor.cpp
+++ b/editor/kmcomposereditor.cpp
@@ -179,9 +179,9 @@ void KMComposerEditor::showSpellConfigDialog(const QString &configFileName)
     }
 }
 
-void KMComposerEditor::mousePopupMenuImplementation(const QPoint &pos)
+QMenu *KMComposerEditor::mousePopupMenu()
 {
-    QMenu *popup = mousePopupMenu();
+    QMenu *popup = MessageComposer::KMeditor::mousePopupMenu();
     if (popup) {
         QTextCursor cursor = textCursor();
         if (cursor.hasSelection()) {
@@ -191,9 +191,7 @@ void KMComposerEditor::mousePopupMenuImplementation(const QPoint &pos)
         popup->addSeparator();
         popup->addAction(mComposerWin->translateAction());
         popup->addAction(mComposerWin->generateShortenUrlAction());
-        aboutToShowContextMenu(popup);
-        popup->exec(pos);
-        delete popup;
     }
+    return popup;
 }
 
diff --git a/editor/kmcomposereditor.h b/editor/kmcomposereditor.h
index 4fbf7e8b6..e13b29fcc 100644
--- a/editor/kmcomposereditor.h
+++ b/editor/kmcomposereditor.h
@@ -67,10 +67,12 @@ public:
     void setHighlighterColors(KPIMTextEdit::EMailQuoteHighlighter *highlighter) Q_DECL_OVERRIDE;
 
     /**
-     * Static Q_DECL_OVERRIDE because we want to hide part of the dialog UI
+     * Static override because we want to hide part of the dialog UI
      */
     void showSpellConfigDialog(const QString &configFileName);
 
+    QMenu *mousePopupMenu() Q_DECL_OVERRIDE;
+
 private:
     KMComposeWin *mComposerWin;
 
@@ -78,9 +80,6 @@ protected:
     bool canInsertFromMimeData(const QMimeData *source) const Q_DECL_OVERRIDE;
     void insertFromMimeData(const QMimeData *source) Q_DECL_OVERRIDE;
 
-protected Q_SLOTS:
-    void mousePopupMenuImplementation(const QPoint &pos);
-
 Q_SIGNALS:
     void insertSnippet();