From 05dd33c1cf2c135ce2186474d72ec00aa8df14a4 Mon Sep 17 00:00:00 2001 From: Levi Neely Date: Fri, 9 Oct 2026 12:13:01 +0200 Subject: [PATCH] kate: remove git++ plugin integration Use only Kate's built-in project git features. The reviewDiff action now uses the active document text directly. --- kde/kate/ollie_kate.cpp | 35 ++++------------------------------- kde/kate/ollie_kate.h | 1 - 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/kde/kate/ollie_kate.cpp b/kde/kate/ollie_kate.cpp index dd6d94c..c5ad51a 100644 --- a/kde/kate/ollie_kate.cpp +++ b/kde/kate/ollie_kate.cpp @@ -174,9 +174,6 @@ OllieKateView::OllieKateView(OllieKatePlugin *plugin, KTextEditor::MainWindow *m // Project tree context menu setupProjectTreeContextMenu(); - // Git++ "Review Diff" action (third-party plugin) - setupGitPlusPlusDiffAction(); - // Kate project plugin's built-in Git widget integration setupProjectGitWidget(); } @@ -463,19 +460,6 @@ void OllieKateView::setupContextMenu(KTextEditor::View *view) }); } -void OllieKateView::setupGitPlusPlusDiffAction() -{ - QObject *gitView = m_mainWindow->pluginView(QStringLiteral("gitplusplus")); - if (!gitView) return; - - auto *action = new QAction(QIcon::fromTheme(QStringLiteral("document-preview")), - QStringLiteral("Ollie: Review Diff"), this); - connect(action, &QAction::triggered, this, &OllieKateView::reviewDiff); - - QMetaObject::invokeMethod(gitView, "registerDiffAction", - Q_ARG(QAction *, action)); -} - void OllieKateView::setupProjectGitWidget() { // Don't retry if we already have the button @@ -860,21 +844,10 @@ void OllieKateView::sendVerbatim() void OllieKateView::reviewDiff() { - QString diff; - - QObject *gitView = m_mainWindow->pluginView(QStringLiteral("gitplusplus")); - if (gitView) { - QByteArray data = gitView->property("lastDiff").toByteArray(); - if (!data.isEmpty()) - diff = QString::fromUtf8(data); - } - - if (diff.isEmpty()) { - auto *view = m_mainWindow->activeView(); - if (view && view->document()) - diff = view->document()->text(); - } - + auto *view = m_mainWindow->activeView(); + if (!view || !view->document()) return; + + QString diff = view->document()->text(); if (diff.trimmed().isEmpty()) return; ensureAgent(); diff --git a/kde/kate/ollie_kate.h b/kde/kate/ollie_kate.h index 8f6b3e9..0d8ffbc 100644 --- a/kde/kate/ollie_kate.h +++ b/kde/kate/ollie_kate.h @@ -95,7 +95,6 @@ private: // Context menu void setupContextMenu(KTextEditor::View *view); void setupProjectTreeContextMenu(); - void setupGitPlusPlusDiffAction(); void setupProjectGitWidget(); void onProjectTreeContextMenu(const QPoint &pos);