Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change RowToTreeNodeJob::m_row type to int and make it const

Browse Source 
It doesn't make much sense to use an "unsigned int" variable only to
cast it to int everywhere where it's used. Just make it "int" from the
get go and have a single cast to int in the caller.

Also make m_row const as it never changes.
This commit is contained in:
Vadim Zeitlin
2018-11-04 14:56:36 +01:00
parent 05ae63e40a
commit 3d4a47a6bb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/generic/datavgen.cpp
View File

@@ -3468,7 +3468,7 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
class RowToTreeNodeJob: public DoJob class RowToTreeNodeJob: public DoJob
{ {
public: public:
RowToTreeNodeJob(unsigned int row, int current, wxDataViewTreeNode *parent) RowToTreeNodeJob(int row, int current, wxDataViewTreeNode *parent)
: m_row(row), m_current(current), m_parent(parent), m_ret(NULL) : m_row(row), m_current(current), m_parent(parent), m_ret(NULL)
{ {
} }
@@ -3476,13 +3476,13 @@ public:
virtual int operator() ( wxDataViewTreeNode * node ) wxOVERRIDE virtual int operator() ( wxDataViewTreeNode * node ) wxOVERRIDE
{ {
m_current ++; m_current ++;
if( m_current == static_cast<int>(m_row)) if( m_current == m_row)
{ {
m_ret = node; m_ret = node;
return DoJob::DONE; return DoJob::DONE;
} }
if( node->GetSubTreeCount() + m_current < static_cast<int>(m_row) ) if( node->GetSubTreeCount() + m_current < m_row )
{ {
m_current += node->GetSubTreeCount(); m_current += node->GetSubTreeCount();
return DoJob::SKIP_SUBTREE; return DoJob::SKIP_SUBTREE;
@@ -3497,7 +3497,7 @@ public:
if ( node->HasChildren() && if ( node->HasChildren() &&
(int)node->GetChildNodes().size() == node->GetSubTreeCount() ) (int)node->GetChildNodes().size() == node->GetSubTreeCount() )
{ {
const int index = static_cast<int>(m_row) - m_current - 1; const int index = m_row - m_current - 1;
m_ret = node->GetChildNodes()[index]; m_ret = node->GetChildNodes()[index];
return DoJob::DONE; return DoJob::DONE;
} }
@@ -3510,7 +3510,7 @@ public:
{ return m_ret; } { return m_ret; }
private: private:
unsigned int m_row; const int m_row;
int m_current; int m_current;
wxDataViewTreeNode* m_parent; wxDataViewTreeNode* m_parent;
wxDataViewTreeNode* m_ret; wxDataViewTreeNode* m_ret;
@@ -3523,7 +3523,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) co
if ( row == (unsigned)-1 ) if ( row == (unsigned)-1 )
return NULL; return NULL;
RowToTreeNodeJob job( row , -2, m_root ); RowToTreeNodeJob job( static_cast<int>(row) , -2, m_root );
Walker( m_root , job ); Walker( m_root , job );
return job.GetResult(); return job.GetResult();
} }