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

Make some local variables const

Browse Source 
No real changes.
This commit is contained in:
Jay Nabonne
2019-02-18 11:32:37 +00:00
committed by Vadim Zeitlin
parent 47e3813d91
commit 4e9c71bb2c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/qt/listctrl.cpp
View File

@@ -261,7 +261,7 @@ bool wxListCtrl::SetColumnsOrder(const wxArrayInt& WXUNUSED(orders))
int wxListCtrl::GetCountPerPage() const int wxListCtrl::GetCountPerPage() const
{ {
// this may not be exact but should be a good approximation: // this may not be exact but should be a good approximation:
int h = m_qtTreeWidget->visualItemRect(m_qtTreeWidget->headerItem()).height(); const int h = m_qtTreeWidget->visualItemRect(m_qtTreeWidget->headerItem()).height();
if ( h ) if ( h )
return m_qtTreeWidget->height() / h; return m_qtTreeWidget->height() / h;
else else
@@ -272,7 +272,7 @@ wxRect wxListCtrl::GetViewRect() const
{ {
// this may not be exact but should be a good approximation: // this may not be exact but should be a good approximation:
wxRect rect = wxQtConvertRect(m_qtTreeWidget->rect()); wxRect rect = wxQtConvertRect(m_qtTreeWidget->rect());
int h = m_qtTreeWidget->header()->defaultSectionSize(); const int h = m_qtTreeWidget->header()->defaultSectionSize();
rect.SetTop(h); rect.SetTop(h);
rect.SetHeight(rect.GetHeight() - h); rect.SetHeight(rect.GetHeight() - h);
return rect; return rect;
@@ -613,8 +613,8 @@ void wxListCtrl::SetWindowStyleFlag(long WXUNUSED(style))
long wxListCtrl::GetNextItem(long item, int WXUNUSED(geometry), int state) const long wxListCtrl::GetNextItem(long item, int WXUNUSED(geometry), int state) const
{ {
wxListItem info; wxListItem info;
long ret = item, long ret = item;
max = GetItemCount(); const long max = GetItemCount();
wxCHECK_MSG( (ret == -1) || (ret < max), -1, wxCHECK_MSG( (ret == -1) || (ret < max), -1,
wxT("invalid listctrl index in GetNextItem()") ); wxT("invalid listctrl index in GetNextItem()") );
@@ -631,8 +631,7 @@ long wxListCtrl::GetNextItem(long item, int WXUNUSED(geometry), int state) const
// any will do // any will do
return (size_t)ret; return (size_t)ret;
size_t count = GetItemCount(); for ( long line = ret; line < max; line++ )
for ( size_t line = (size_t)ret; line < count; line++ )
{ {
if ( GetItemState(line, state) ) if ( GetItemState(line, state) )
return line; return line;
@@ -758,7 +757,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* WXUNUSED(textControlCl
bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel)) bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel))
{ {
int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); const int item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
if (item > 0) if (item > 0)
{ {
QTreeWidgetItem *qitem = QtGetItem(item); QTreeWidgetItem *qitem = QtGetItem(item);