From: Zack Rusin Date: Sun, 28 Aug 2011 03:29:19 +0000 (-0400) Subject: Change filterText to searchText X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=dc792082bcdd4b761af6b22e67570098ebf9f3f2;p=apitrace Change filterText to searchText Because it's used for searching not filtering, as it was before. --- diff --git a/gui/apitracecall.cpp b/gui/apitracecall.cpp index 180dab4..afc4b35 100644 --- a/gui/apitracecall.cpp +++ b/gui/apitracecall.cpp @@ -626,7 +626,7 @@ void ApiTraceCall::setEditedValues(const QVariantList &lst) m_editedValues = lst; //lets regenerate data m_richText = QString(); - m_filterText = QString(); + m_searchText = QString(); delete m_staticText; m_staticText = 0; @@ -827,28 +827,28 @@ QString ApiTraceCall::toHtml() const return m_richText; } -QString ApiTraceCall::filterText() const +QString ApiTraceCall::searchText() const { - if (!m_filterText.isEmpty()) - return m_filterText; + if (!m_searchText.isEmpty()) + return m_searchText; QVariantList argValues = arguments(); - m_filterText = m_name + QLatin1Literal("("); + m_searchText = m_name + QLatin1Literal("("); for (int i = 0; i < m_argNames.count(); ++i) { - m_filterText += m_argNames[i] + + m_searchText += m_argNames[i] + QLatin1Literal(" = ") + apiVariantToString(argValues[i]); if (i < m_argNames.count() - 1) - m_filterText += QLatin1String(", "); + m_searchText += QLatin1String(", "); } - m_filterText += QLatin1String(")"); + m_searchText += QLatin1String(")"); if (m_returnValue.isValid()) { - m_filterText += QLatin1Literal(" = ") + + m_searchText += QLatin1Literal(" = ") + apiVariantToString(m_returnValue); } - m_filterText.squeeze(); - return m_filterText; + m_searchText.squeeze(); + return m_searchText; } int ApiTraceCall::numChildren() const diff --git a/gui/apitracecall.h b/gui/apitracecall.h index 7eae245..4892368 100644 --- a/gui/apitracecall.h +++ b/gui/apitracecall.h @@ -211,7 +211,7 @@ public: ApiTrace *parentTrace() const; QString toHtml() const; - QString filterText() const; + QString searchText() const; QStaticText staticText() const; int numChildren() const; bool hasBinaryData() const; @@ -230,7 +230,7 @@ private: QString m_error; mutable QString m_richText; - mutable QString m_filterText; + mutable QString m_searchText; mutable bool m_hasBinaryData; mutable int m_binaryDataIndex; }; diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 465dd8b..ba19b4d 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -865,7 +865,7 @@ void MainWindow::slotSearchNext(const QString &str, /* if it's not valid it means that the proxy model has already * filtered it out */ if (index.isValid()) { - QString txt = testCall->filterText(); + QString txt = testCall->searchText(); if (txt.contains(str, sensitivity)) { m_ui.callView->setCurrentIndex(index); m_searchWidget->setFound(true); @@ -916,7 +916,7 @@ void MainWindow::slotSearchPrev(const QString &str, /* if it's not valid it means that the proxy model has already * filtered it out */ if (index.isValid()) { - QString txt = testCall->filterText(); + QString txt = testCall->searchText(); if (txt.contains(str, sensitivity)) { m_ui.callView->setCurrentIndex(index); m_searchWidget->setFound(true);