Fix some compiler warnings

This commit is contained in:
Kevin Funk 2017-04-07 16:13:18 +02:00
parent a3920e3ae9
commit f2758ec9f7
3 changed files with 26 additions and 26 deletions

View file

@ -127,7 +127,7 @@ public:
* @deprecated The first tab state version has no version number, we keep
* this method to restore old states (<= Dolphin 4.14.x).
*/
void restoreStateV1(const QByteArray& state);
Q_DECL_DEPRECATED void restoreStateV1(const QByteArray& state);
signals:
void activeViewChanged(DolphinViewContainer* viewContainer);

View file

@ -197,12 +197,13 @@ public:
int lastVisibleIndex() const;
/**
* @return Calculates the required size for all items in the model.
* It might be larger than KItemListView::itemSize().
* In this case the layout grid will be stretched to assure an
* unclipped item.
* NOTE: the logical height (width) is actually the
* width (height) if the scroll orientation is Qt::Vertical!
* Calculates the required size for all items in the model.
* It might be larger than KItemListView::itemSize().
* In this case the layout grid will be stretched to assure an
* unclipped item.
*
* @note the logical height (width) is actually the
* width (height) if the scroll orientation is Qt::Vertical!
*/
void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint) const;

View file

@ -335,27 +335,26 @@ Q_DECLARE_METATYPE(QList<int>)
*
* The test is data-driven and takes the following arguments:
*
* \param initialSelection The selection at the beginning.
* \param anchor This item will be the anchor item.
* \param current This item will be the current item.
* \param expectedSelection Expected selection after anchor and current are set.
* \param changeType Type of the change that is done then:
* - NoChange
* - InsertItems -> data.at(0) provides the KItemRangeList. \sa KItemListSelectionManager::itemsInserted()
* - RemoveItems -> data.at(0) provides the KItemRangeList. \sa KItemListSelectionManager::itemsRemoved()
* - MoveItems -> data.at(0) provides the KItemRange containing the original indices,
* data.at(1) provides the list containing the new indices
* \sa KItemListSelectionManager::itemsMoved(), KItemModelBase::itemsMoved()
* - EndAnchoredSelection
* - SetSelected -> data.at(0) provides the index where the selection process starts,
* data.at(1) provides the number of indices to be selected,
* data.at(2) provides the selection mode.
* \sa KItemListSelectionManager::setSelected()
* \param data A list of QVariants which will be cast to the arguments needed for the chosen ChangeType (see above).
* \param finalSelection The expected final selection.
* param initialSelection The selection at the beginning.
* param anchor This item will be the anchor item.
* param current This item will be the current item.
* param expectedSelection Expected selection after anchor and current are set.
* param changeType Type of the change that is done then:
* - NoChange
* - InsertItems -> data.at(0) provides the KItemRangeList. \sa KItemListSelectionManager::itemsInserted()
* - RemoveItems -> data.at(0) provides the KItemRangeList. \sa KItemListSelectionManager::itemsRemoved()
* - MoveItems -> data.at(0) provides the KItemRange containing the original indices,
* data.at(1) provides the list containing the new indices
* \sa KItemListSelectionManager::itemsMoved(), KItemModelBase::itemsMoved()
* - EndAnchoredSelection
* - SetSelected -> data.at(0) provides the index where the selection process starts,
* data.at(1) provides the number of indices to be selected,
* data.at(2) provides the selection mode.
* \sa KItemListSelectionManager::setSelected()
* param data A list of QVariants which will be cast to the arguments needed for the chosen ChangeType (see above).
* param finalSelection The expected final selection.
*
*/
void KItemListSelectionManagerTest::testChangeSelection_data()
{
QTest::addColumn<KItemSet>("initialSelection");