From 1f0aad61e2597f849abb22809680a3741aa481ce Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 4 Nov 2018 17:20:11 +0100 Subject: [PATCH] Use standard naming convention for ItemToRowJob members Use "m_" prefix for all of them. No real changes. --- src/generic/datavgen.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index f2db03c189..1d2f65d00f 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -3860,18 +3860,16 @@ int wxDataViewMainWindow::RecalculateCount() const class ItemToRowJob : public DoJob { public: - ItemToRowJob(const wxDataViewItem& item_, wxVector::reverse_iterator iter) - : m_iter(iter), - item(item_) + ItemToRowJob(const wxDataViewItem& item, wxVector::reverse_iterator iter) + : m_item(item), m_iter(iter), m_ret(-1) { - ret = -1; } // Maybe binary search will help to speed up this process virtual int operator() ( wxDataViewTreeNode * node) wxOVERRIDE { - ret ++; - if( node->GetItem() == item ) + m_ret ++; + if( node->GetItem() == m_item ) { return DoJob::DONE; } @@ -3883,7 +3881,7 @@ public: } else { - ret += node->GetSubTreeCount(); + m_ret += node->GetSubTreeCount(); return DoJob::SKIP_SUBTREE; } @@ -3891,12 +3889,12 @@ public: // the row number is begin from zero int GetResult() const - { return ret -1; } + { return m_ret -1; } private: + wxDataViewItem m_item; wxVector::reverse_iterator m_iter; - wxDataViewItem item; - int ret; + int m_ret; };