[rkward] rkward/windows: Fix script editor popup menu by removing legacy code.

Thomas Friedrichsmeier null at kde.org
Sat Mar 28 10:28:25 GMT 2020


Git commit 3ed6821983ad243654f8aaf954fff472824bdef1 by Thomas Friedrichsmeier.
Committed on 28/03/2020 at 09:59.
Pushed by tfry into branch 'master'.

Fix script editor popup menu by removing legacy code.

(Hope it isn't still required on any supported config)

M  +0    -12   rkward/windows/rkcommandeditorwindow.cpp
M  +0    -1    rkward/windows/rkcommandeditorwindow.h

https://commits.kde.org/rkward/3ed6821983ad243654f8aaf954fff472824bdef1

diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index fe4d5091..b0b21a49 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -261,7 +261,6 @@ RKCommandEditorWindow::RKCommandEditorWindow (QWidget *parent, const QUrl _url,
 	connect (&preview_timer, &QTimer::timeout, this, &RKCommandEditorWindow::doRenderPreview);
 
 	updateCaption ();	// initialize
-	QTimer::singleShot (0, this, SLOT (setPopupMenu()));
 }
 
 RKCommandEditorWindow::~RKCommandEditorWindow () {
@@ -458,17 +457,6 @@ void RKCommandEditorWindow::initBlocks () {
 void RKCommandEditorWindow::focusIn (KTextEditor::View* v) {
 	RK_TRACE (COMMANDEDITOR);
 	RK_ASSERT (v == m_view);
-
-	setPopupMenu ();
-}
-
-/** NOTE: this function still needed?
-- Still needed in KDE 4.3.4. */
-void RKCommandEditorWindow::setPopupMenu () {
-	RK_TRACE (COMMANDEDITOR);
-
-	if (!getPart ()->factory ()) return;
-	m_view->setContextMenu (static_cast<QMenu *> (getPart ()->factory ()->container ("ktexteditor_popup", getPart ())));
 }
 
 QString RKCommandEditorWindow::fullCaption () {
diff --git a/rkward/windows/rkcommandeditorwindow.h b/rkward/windows/rkcommandeditorwindow.h
index 21876b55..d0885348 100644
--- a/rkward/windows/rkcommandeditorwindow.h
+++ b/rkward/windows/rkcommandeditorwindow.h
@@ -156,7 +156,6 @@ public:
 public slots:
 /** update Tab caption according to the current url. Display the filename-component of the URL, or - if not available - a more elaborate description of the url. Also appends a "[modified]" if appropriate */
 	void updateCaption ();
-	void setPopupMenu ();
 	void focusIn (KTextEditor::View *);
 /** run the currently selected command(s) or line */
 	void runCurrent ();



More information about the rkward-tracker mailing list