2136695 · unity8 · git.iko.soy

git.iko.soy/unity8

Add Y to the end of some methods parameter names

commit2136695091b2ccb4c536ddb4dd1d82b0cf087507 authorAlbert Astals <albert.astals@canonical.com> dateFri 3 Jan 2014, 10:18 (13 years ago) parent37a3326

6 files changed+20−20

compare with xenial

unifiedsplit

plugins/DashViews/abstractjournal.cpp+3−3 plugins/DashViews/abstractjournal.h+3−3 plugins/DashViews/horizontaljournal.cpp+5−5 plugins/DashViews/horizontaljournal.h+2−2 plugins/DashViews/verticaljournal.cpp+5−5 plugins/DashViews/verticaljournal.h+2−2

plugins/DashViews/abstractjournal.cpp+3−3

@@ -214,7 +214,7 @@ void AbstractJournal::refill()

214214 }

215215}

216216

217−bool AbstractJournal::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous)

217+bool AbstractJournal::addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous)

218218{

219219 if (!delegate())

220220 return false;

@@ -226,7 +226,7 @@ bool AbstractJournal::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchr

226226 qreal yPos;

227227 findBottomModelIndexToAdd(&modelIndex, &yPos);

228228 bool changed = false;

229− while (modelIndex < m_delegateModel->count() && yPos <= fillTo) {

229+ while (modelIndex < m_delegateModel->count() && yPos <= fillToY) {

230230 if (!createItem(modelIndex, asynchronous))

231231 break;

232232

@@ -235,7 +235,7 @@ bool AbstractJournal::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchr

235235 }

236236

237237 findTopModelIndexToAdd(&modelIndex, &yPos);

238− while (modelIndex >= 0 && yPos > fillFrom) {

238+ while (modelIndex >= 0 && yPos > fillFromY) {

239239 if (!createItem(modelIndex, asynchronous))

240240 break;

241241

plugins/DashViews/abstractjournal.h+3−3

@@ -105,16 +105,16 @@ private Q_SLOTS:

105105private:

106106 void createDelegateModel();

107107 void refill();

108− bool addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous);

108+ bool addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous);

109109 QQuickItem *createItem(int modelIndex, bool asynchronous);

110110

111111 virtual void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;

112112 virtual void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;

113113 virtual void positionItem(int modelIndex, QQuickItem *item) = 0;

114− virtual bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) = 0;

114+ virtual bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) = 0;

115115 virtual void cleanupExistingItems() = 0;

116116 virtual void doRelayout() = 0;

117− virtual void updateItemCulling(qreal visibleFrom, qreal visibleTo) = 0;

117+ virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;

118118 virtual void calculateImplicitHeight() = 0;

119119#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

120120 virtual void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) = 0;

plugins/DashViews/horizontaljournal.cpp+5−5

@@ -95,17 +95,17 @@ void HorizontalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

9595 }

9696}

9797

98−bool HorizontalJournal::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)

98+bool HorizontalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

9999{

100100 bool changed = false;

101101

102− while (!m_visibleItems.isEmpty() && m_visibleItems.first()->y() + m_rowHeight < bufferFrom) {

102+ while (!m_visibleItems.isEmpty() && m_visibleItems.first()->y() + m_rowHeight < bufferFromY) {

103103 releaseItem(m_visibleItems.takeFirst());

104104 changed = true;

105105 m_firstVisibleIndex++;

106106 }

107107

108− while (!m_visibleItems.isEmpty() && m_visibleItems.last()->y() > bufferTo) {

108+ while (!m_visibleItems.isEmpty() && m_visibleItems.last()->y() > bufferToY) {

109109 releaseItem(m_visibleItems.takeLast());

110110 changed = true;

111111 m_lastInRowIndexPosition.remove(m_firstVisibleIndex + m_visibleItems.count());

@@ -245,9 +245,9 @@ void HorizontalJournal::doRelayout()

245245 }

246246}

247247

248−void HorizontalJournal::updateItemCulling(qreal visibleFrom, qreal visibleTo)

248+void HorizontalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

249249{

250250 Q_FOREACH(QQuickItem *item, m_visibleItems) {

251− QQuickItemPrivate::get(item)->setCulled(item->y() + m_rowHeight <= visibleFrom || item->y() >= visibleTo);

251+ QQuickItemPrivate::get(item)->setCulled(item->y() + m_rowHeight <= visibleFromY || item->y() >= visibleToY);

252252 }

253253}

plugins/DashViews/horizontaljournal.h+2−2

@@ -46,12 +46,12 @@ Q_SIGNALS:

4646private:

4747 void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

4848 void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

49− bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) override;

49+ bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

5050 void positionItem(int modelIndex, QQuickItem *item) override;

5151 void cleanupExistingItems() override;

5252 void calculateImplicitHeight() override;

5353 void doRelayout() override;

54− void updateItemCulling(qreal visibleFrom, qreal visibleTo) override;

54+ void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

5555#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

5656 void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;

5757#else

plugins/DashViews/verticaljournal.cpp+5−5

@@ -110,18 +110,18 @@ void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

110110 }

111111}

112112

113−bool VerticalJournal::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)

113+bool VerticalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

114114{

115115 bool changed = false;

116116

117117 for (int i = 0; i < m_columnVisibleItems.count(); ++i) {

118118 QList<ViewItem> &column = m_columnVisibleItems[i];

119− while (!column.isEmpty() && column.first().y() + column.first().height() < bufferFrom) {

119+ while (!column.isEmpty() && column.first().y() + column.first().height() < bufferFromY) {

120120 releaseItem(column.takeFirst().m_item);

121121 changed = true;

122122 }

123123

124− while (!column.isEmpty() && column.last().y() > bufferTo) {

124+ while (!column.isEmpty() && column.last().y() > bufferToY) {

125125 releaseItem(column.takeLast().m_item);

126126 changed = true;

127127 }

@@ -228,11 +228,11 @@ void VerticalJournal::doRelayout()

228228 }

229229}

230230

231−void VerticalJournal::updateItemCulling(qreal visibleFrom, qreal visibleTo)

231+void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

232232{

233233 Q_FOREACH(const auto &column, m_columnVisibleItems) {

234234 Q_FOREACH(const ViewItem &item, column) {

235− const bool cull = item.y() + item.height() <= visibleFrom || item.y() >= visibleTo;

235+ const bool cull = item.y() + item.height() <= visibleFromY || item.y() >= visibleToY;

236236 QQuickItemPrivate::get(item.m_item)->setCulled(cull);

237237 }

238238 }

plugins/DashViews/verticaljournal.h+2−2

@@ -84,12 +84,12 @@ private:

8484

8585 void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

8686 void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

87− bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) override;

87+ bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

8888 void positionItem(int modelIndex, QQuickItem *item) override;

8989 void cleanupExistingItems() override;

9090 void calculateImplicitHeight() override;

9191 void doRelayout() override;

92− void updateItemCulling(qreal visibleFrom, qreal visibleTo) override;

92+ void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

9393#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

9494 void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;

9595#else