aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYordan Karadzhov <ykaradzhov@vmware.com>2019-02-12 19:04:02 +0200
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-02-13 09:40:54 -0500
commited60f0b6f6d40d674b3b868dfc006328ab95e985 (patch)
treef8c28527816d5a4474eb3ed2c3c3a9a371909c33
parent212ea2ae49058af11686f6ffd7738737a137a664 (diff)
downloadtrace-cmd-ed60f0b6f6d40d674b3b868dfc006328ab95e985.tar.gz
kernel-shark: Rename the method for deselecting the Active marker.
This method deselects the Active marker regardless of its state (A or B). The method is renamed in order to avoid confusion with the methods for deselecting markers A and B. Link: http://lore.kernel.org/linux-trace-devel/20190212170402.10104-6-ykaradzhov@vmware.com Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202327 Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel-shark/src/KsMainWindow.cpp8
-rw-r--r--kernel-shark/src/KsMainWindow.hpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp
index 443b7b0c..362b9556 100644
--- a/kernel-shark/src/KsMainWindow.cpp
+++ b/kernel-shark/src/KsMainWindow.cpp
@@ -101,10 +101,10 @@ KsMainWindow::KsMainWindow(QWidget *parent)
&_view, &KsTraceViewer::showRow);
connect(&_graph, &KsTraceGraph::deselect,
- this, &KsMainWindow::_deselect);
+ this, &KsMainWindow::_deselectActive);
connect(&_view, &KsTraceViewer::deselect,
- this, &KsMainWindow::_deselect);
+ this, &KsMainWindow::_deselectActive);
connect(&_data, &KsDataStore::updateWidgets,
&_view, &KsTraceViewer::update);
@@ -117,7 +117,7 @@ KsMainWindow::KsMainWindow(QWidget *parent)
_deselectShortcut.setKey(Qt::CTRL + Qt::Key_D);
connect(&_deselectShortcut, &QShortcut::activated,
- this, &KsMainWindow::_deselect);
+ this, &KsMainWindow::_deselectActive);
connect(&_mState, &KsDualMarkerSM::deselectA,
this, &KsMainWindow::_deselectA);
@@ -1136,7 +1136,7 @@ void KsMainWindow::_splitterMoved(int pos, int index)
_session.saveSplitterSize(_splitter);
}
-void KsMainWindow::_deselect()
+void KsMainWindow::_deselectActive()
{
_view.clearSelection();
_mState.activeMarker().remove();
diff --git a/kernel-shark/src/KsMainWindow.hpp b/kernel-shark/src/KsMainWindow.hpp
index abfe1962..969b6031 100644
--- a/kernel-shark/src/KsMainWindow.hpp
+++ b/kernel-shark/src/KsMainWindow.hpp
@@ -216,7 +216,7 @@ private:
void _error(const QString &text, const QString &errCode,
bool resize, bool unloadPlugins);
- void _deselect();
+ void _deselectActive();
void _deselectA();