[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-baseapps/frameworks] lib/konq/src: KonqPopupMenu: remove unused var, clean up docu
From:       David Faure <faure () kde ! org>
Date:       2016-02-27 15:58:05
Message-ID: E1aZhFt-0006Hi-Lc () scm ! kde ! org
[Download RAW message or body]

Git commit 60d2a00eaac9ae293eaeb323c03455e265412f09 by David Faure.
Committed on 27/02/2016 at 15:43.
Pushed by dfaure into branch 'frameworks'.

KonqPopupMenu: remove unused var, clean up docu

M  +1    -3    lib/konq/src/konq_popupmenu.cpp
M  +2    -4    lib/konq/src/konq_popupmenu.h

http://commits.kde.org/kde-baseapps/60d2a00eaac9ae293eaeb323c03455e265412f09

diff --git a/lib/konq/src/konq_popupmenu.cpp b/lib/konq/src/konq_popupmenu.=
cpp
index d08168a..23fc761 100644
--- a/lib/konq/src/konq_popupmenu.cpp
+++ b/lib/konq/src/konq_popupmenu.cpp
@@ -82,8 +82,7 @@ public:
           m_pMenuNew(0),
           m_copyToMenu(parentWidget),
           m_bookmarkManager(0),
-          m_actions(actions),
-          m_ownActionCollection(static_cast<QWidget *>(0))
+          m_actions(actions)
     {
     }
 =

@@ -119,7 +118,6 @@ public:
     KonqCopyToMenu m_copyToMenu;
     KBookmarkManager *m_bookmarkManager;
     KActionCollection &m_actions;
-    KActionCollection m_ownActionCollection; // only used by plugins; KDE5=
: pass m_ownActions instead
     QList<QAction *> m_ownActions;
     KonqPopupMenu::ActionGroupMap m_actionGroups;
 };
diff --git a/lib/konq/src/konq_popupmenu.h b/lib/konq/src/konq_popupmenu.h
index e798ff4..7b87f62 100644
--- a/lib/konq/src/konq_popupmenu.h
+++ b/lib/konq/src/konq_popupmenu.h
@@ -98,11 +98,9 @@ public:
      * @param parentWidget the widget we're showing this popup for. Helps =
destroying
      * the popup if the widget is destroyed before the popup.
      *
-     * The actions to pass in include :
-     * showmenubar, go_back, go_forward, go_up, cut, copy, paste, pasteto
+     * The actions to pass in the action collection are :
+     * go_back, go_forward, go_up, reload, cut, copy, paste, pasteto
      * The others items are automatically inserted.
-     *
-     * @todo that list is probably not be up-to-date
      */
     KonqPopupMenu(const KFileItemList &items,
                   const QUrl &viewURL,

[prev in list] [next in list] [prev in thread] [next in thread]