[multimedia/kdenlive] src: Remove ghost menu caused by deprecated marker_menu entry

Git commit 9c781e4abaabea943d2b3c8ceb367818c396ef9c by Jean-Baptiste Mardelle.
Committed on 18/08/2026 at 09:44.
Pushed by mardelle into branch 'master'.

Remove ghost menu caused by deprecated marker_menu entry
Replaces !957

M  +2    -2    src/mainwindow.cpp
M  +1    -21   src/monitor/monitor.cpp
M  +1    -4    src/monitor/monitor.h

https://invent.kde.org/multimedia/kdenlive/-/commit/9c781e4abaabea943d2b3c8ceb367818c396ef9c

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index cf92e8e095..1b7a6d12d7 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1024,9 +1024,9 @@ void MainWindow::loadContainerActions()
         connect(monitorOverlay, &QMenu::triggered, this, &MainWindow::slotSwitchMonitorOverlay);
 
         m_projectMonitor->setupMenu(static_cast<QMenu *>(factory()->container(QStringLiteral("monitor_go"), this)), monitorOverlay, m_playZone,
-                                    m_playZoneFromCursor, m_loopZone, nullptr, m_loopClip);
+                                    m_playZoneFromCursor, m_loopZone, m_loopClip);
         m_clipMonitor->setupMenu(static_cast<QMenu *>(factory()->container(QStringLiteral("monitor_go"), this)), monitorOverlay, m_playZone,
-                                 m_playZoneFromCursor, m_loopZone, static_cast<QMenu *>(factory()->container(QStringLiteral("marker_menu"), this)), nullptr);
+                                 m_playZoneFromCursor, m_loopZone, nullptr);
     }
 
     QMenu *clipInTimeline = static_cast<QMenu *>(factory()->container(QStringLiteral("clip_in_timeline"), this));
diff --git a/src/monitor/monitor.cpp b/src/monitor/monitor.cpp
index e80aabef10..c21f39fc16 100644
--- a/src/monitor/monitor.cpp
+++ b/src/monitor/monitor.cpp
@@ -124,7 +124,6 @@ Monitor::Monitor(Kdenlive::MonitorId id, MonitorManager *manager, QWidget *paren
     , m_markerMenu(nullptr)
     , m_audioChannels(nullptr)
     , m_loopClipTransition(true)
-    , m_editMarker(nullptr)
     , m_forceSizeFactor(0)
     , m_lastMonitorSceneType(SceneType::MonitorSceneDefault)
 {
@@ -666,8 +665,7 @@ void Monitor::slotLockMonitor(bool lock)
     m_monitorManager->lockMonitor(m_id, lock);
 }
 
-void Monitor::setupMenu(QMenu *goMenu, QMenu *overlayMenu, QAction *playZone, QAction *playZoneFromCursor, QAction *loopZone, QMenu *markerMenu,
-                        QAction *loopClip)
+void Monitor::setupMenu(QMenu *goMenu, QMenu *overlayMenu, QAction *playZone, QAction *playZoneFromCursor, QAction *loopZone, QAction *loopClip)
 {
     delete m_contextMenu;
     m_contextMenu = new QMenu(this);
@@ -676,17 +674,6 @@ void Monitor::setupMenu(QMenu *goMenu, QMenu *overlayMenu, QAction *playZone, QA
         m_contextMenu->addMenu(goMenu);
     }
 
-    if (markerMenu) {
-        m_contextMenu->addMenu(markerMenu);
-        QList<QAction *> list = markerMenu->actions();
-        for (int i = 0; i < list.count(); ++i) {
-            if (list.at(i)->objectName() == QLatin1String("edit_marker")) {
-                m_editMarker = list.at(i);
-                break;
-            }
-        }
-    }
-
     m_playMenu->addAction(playZone);
     m_playMenu->addAction(playZoneFromCursor);
     m_playMenu->addAction(loopZone);
@@ -2452,13 +2439,6 @@ void Monitor::switchMonitorInfo(int code)
     }
 }
 
-void Monitor::slotEditMarker()
-{
-    if (m_editMarker) {
-        m_editMarker->trigger();
-    }
-}
-
 void Monitor::updateTimecodeFormat()
 {
     m_glMonitor->rootObject()->setProperty("timecode", m_timePos->displayText());
diff --git a/src/monitor/monitor.h b/src/monitor/monitor.h
index 5ea26f42ce..564670b42c 100644
--- a/src/monitor/monitor.h
+++ b/src/monitor/monitor.h
@@ -81,8 +81,7 @@ public:
     void resetProfile();
     /** @brief Rebuild consumers after a property change */
     void resetConsumer(bool fullReset);
-    void setupMenu(QMenu *goMenu, QMenu *overlayMenu, QAction *playZone, QAction *playZoneFromCursor, QAction *loopZone, QMenu *markerMenu = nullptr,
-                   QAction *loopClip = nullptr);
+    void setupMenu(QMenu *goMenu, QMenu *overlayMenu, QAction *playZone, QAction *playZoneFromCursor, QAction *loopZone, QAction *loopClip = nullptr);
     const QString activeClipId(bool withSequence = false);
     int position();
     void updateTimecodeFormat();
@@ -267,7 +266,6 @@ private:
     QAction *m_fiveLess;
     QAction *m_fiveMore;
     QLabel *m_trimmingOffset;
-    QAction *m_editMarker;
     KMessageWidget *m_infoMessage;
     int m_forceSizeFactor;
     SceneType::MonitorSceneType m_lastMonitorSceneType;
@@ -308,7 +306,6 @@ private Q_SLOTS:
     void updateClipZone(const QPoint zone);
     void slotGoToMarker(QAction *action);
     void slotSetVolume(int volume);
-    void slotEditMarker();
     void slotExtractCurrentZone();
     void onFrameDisplayed(const SharedFrame &frame);
     void slotStartDrag();