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

List:       kde-commits
Subject:    [kdevelop/5.3] plugins/standardoutputview: [StandardOutputView] Remove dead & broken code for prev_e
From:       Friedrich W. H. Kossebau <null () kde ! org>
Date:       2018-09-11 14:27:12
Message-ID: E1fzjdI-0005pU-32 () code ! kde ! org
[Download RAW message or body]

Git commit 4378163c11aeb291023fe5da2899e5da9a22f4f5 by Friedrich W. H. Kossebau.
Committed on 11/09/2018 at 14:27.
Pushed by kossebau into branch '5.3'.

[StandardOutputView] Remove dead & broken code for prev_error/next_error

Summary:
Commit 9ec8eee23ecbbb0176996542d054758262500240 had removed the custom
actions prev_error & next_error in favour of some global actions with
global shortcut, which would dynamically decide which result tool view to
apply the action (e.g. by shortcut) on. Two things were forgotten:

a) the plugin still installed a ui.rc file for those actions

b) The OutputWidget still tried to get the two actions by their id from
the plugin, to insert it into its own UI. Later the commit
fc8d34f0b00a9d0f4bbf480b06a34a9190b46d20 also added generic actions to
the widget. As a result of the failing action fetching two warnings
QWidget::insertAction: Attempt to insert null action
were seen on the log.

This commit fixes both by removing the no longer useful code.

Test Plan:
Output widget still works WRT item navigation, both from main menu and from
toolview actions.

Reviewers: #kdevelop, kfunk

Reviewed By: #kdevelop, kfunk

Subscribers: kdevelop-devel

Tags: #kdevelop

Differential Revision: https://phabricator.kde.org/D15432

M  +0    -1    plugins/standardoutputview/CMakeLists.txt
D  +0    -6    plugins/standardoutputview/kdevstandardoutputview.qrc
D  +0    -10   plugins/standardoutputview/kdevstandardoutputview.rc
M  +0    -3    plugins/standardoutputview/outputwidget.cpp
M  +0    -2    plugins/standardoutputview/standardoutputview.cpp

https://commits.kde.org/kdevelop/4378163c11aeb291023fe5da2899e5da9a22f4f5

diff --git a/plugins/standardoutputview/CMakeLists.txt \
b/plugins/standardoutputview/CMakeLists.txt index 4b92da8c6e..eb73758301 100644
--- a/plugins/standardoutputview/CMakeLists.txt
+++ b/plugins/standardoutputview/CMakeLists.txt
@@ -16,7 +16,6 @@ set(standardoutputview_LIB_SRCS
     ${standardoutputview_LOG_PART_SRCS}
 )
 
-qt5_add_resources(standardoutputview_LIB_SRCS kdevstandardoutputview.qrc)
 kdevplatform_add_plugin(kdevstandardoutputview JSON kdevstandardoutputview.json \
SOURCES  ${standardoutputview_LIB_SRCS})  
 target_link_libraries(kdevstandardoutputview
diff --git a/plugins/standardoutputview/kdevstandardoutputview.qrc \
b/plugins/standardoutputview/kdevstandardoutputview.qrc deleted file mode 100644
index a1a16cee94..0000000000
--- a/plugins/standardoutputview/kdevstandardoutputview.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-    <qresource prefix="/kxmlgui5/kdevstandardoutputview">
-        <file>kdevstandardoutputview.rc</file>
-    </qresource>
-</RCC>
diff --git a/plugins/standardoutputview/kdevstandardoutputview.rc \
b/plugins/standardoutputview/kdevstandardoutputview.rc deleted file mode 100644
index f964e6f9c1..0000000000
--- a/plugins/standardoutputview/kdevstandardoutputview.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE gui SYSTEM "kpartgui.dtd">
-<gui name="kdevstandardoutputview" version="7" \
                translationDomain="kdevstandardoutputview">
-<MenuBar>
-  <Menu name="navigation">
-    <Action name="prev_error" />
-    <Action name="next_error" />
-  </Menu>
-</MenuBar>
-</gui>
-
diff --git a/plugins/standardoutputview/outputwidget.cpp \
b/plugins/standardoutputview/outputwidget.cpp index 9980f429bd..292501dfcb 100644
--- a/plugins/standardoutputview/outputwidget.cpp
+++ b/plugins/standardoutputview/outputwidget.cpp
@@ -102,9 +102,6 @@ OutputWidget::OutputWidget(QWidget* parent, const ToolViewData* \
tvdata)  addAction(m_nextAction);
     }
 
-    addAction(dynamic_cast<QAction*>(data->plugin->actionCollection()->action(QStringLiteral("prev_error"))));
                
-    addAction(dynamic_cast<QAction*>(data->plugin->actionCollection()->action(QStringLiteral("next_error"))));
                
-
     m_activateOnSelect = new KToggleAction( QIcon(), i18n("Select activated Item"), \
this );  m_activateOnSelect->setChecked( true );
     m_focusOnSelect = new KToggleAction( QIcon(), i18n("Focus when selecting Item"), \
                this );
diff --git a/plugins/standardoutputview/standardoutputview.cpp \
b/plugins/standardoutputview/standardoutputview.cpp index 26e8113176..6c324e1884 \
                100644
--- a/plugins/standardoutputview/standardoutputview.cpp
+++ b/plugins/standardoutputview/standardoutputview.cpp
@@ -66,8 +66,6 @@ private:
 StandardOutputView::StandardOutputView(QObject *parent, const QVariantList &)
     : KDevelop::IPlugin(QStringLiteral("kdevstandardoutputview"), parent)
 {
-    setXMLFile(QStringLiteral("kdevstandardoutputview.rc"));
-
     connect(KDevelop::ICore::self()->uiController()->controller(), \
&Sublime::Controller::aboutToRemoveView,  this, \
&StandardOutputView::removeSublimeView);  


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