kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix 5 clazy warnings

Browse Source 
This bumps the minimum Qt version to 5.5 (because of Q_ENUM usage).

REVIEW: 129604
This commit is contained in:
Spencer Brown 2016-12-03 15:58:39 +01:00 committed by Elvis Angelaccio
parent b6e76f006d
commit 73a6bf4e10
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -8,7 +8,7 @@ set (KDE_APPLICATIONS_VERSION_MINOR "03")
set (KDE_APPLICATIONS_VERSION_MICRO "70")
set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
set(QT_MIN_VERSION "5.4.0")
set(QT_MIN_VERSION "5.5.0")
set(KF5_MIN_VERSION "5.21.0")
set(ECM_MIN_VERSION "1.6.0")

2
src/kitemviews/kitemlistcontroller.h
View File

@ -59,7 +59,6 @@ class QTransform;
class DOLPHIN_EXPORT KItemListController : public QObject
{
Q_OBJECT
Q_ENUMS(SelectionBehavior)
Q_PROPERTY(KItemModelBase* model READ model WRITE setModel)
Q_PROPERTY(KItemListView *view READ view WRITE setView)
Q_PROPERTY(SelectionBehavior selectionBehavior READ selectionBehavior WRITE setSelectionBehavior)
@ -72,6 +71,7 @@ public:
SingleSelection,
MultiSelection
};
Q_ENUM(SelectionBehavior)
enum AutoActivationBehavior {
ActivationAndExpansion,

6
src/tests/kfileitemmodeltest.cpp
View File

@ -154,9 +154,9 @@ void KFileItemModelTest::testDefaultSortRole()
QVERIFY(itemsInsertedSpy.wait());
QCOMPARE(m_model->count(), 3);
QCOMPARE(m_model->data(0)["text"].toString(), QString("a.txt"));
QCOMPARE(m_model->data(1)["text"].toString(), QString("b.txt"));
QCOMPARE(m_model->data(2)["text"].toString(), QString("c.txt"));
QCOMPARE(m_model->data(0).value("text").toString(), QString("a.txt"));
QCOMPARE(m_model->data(1).value("text").toString(), QString("b.txt"));
QCOMPARE(m_model->data(2).value("text").toString(), QString("c.txt"));
}
void KFileItemModelTest::testDefaultGroupedSorting()

6
src/tests/kitemsettest.cpp
View File

@ -72,14 +72,14 @@ QVector<int> KItemRangeList2QVector(const KItemRangeList& itemRanges)
static QSet<int> KItemSet2QSet(const KItemSet& itemSet)
{
QSet<int> result;
foreach (int i, itemSet) {
for (int i : itemSet) {
result.insert(i);
}
// Check that the conversion was successful.
Q_ASSERT(itemSet.count() == result.count());
foreach (int i, itemSet) {
for (int i : itemSet) {
Q_ASSERT(result.contains(i));
}
@ -239,7 +239,7 @@ void KItemSetTest::testIterators()
QCOMPARE(testQVector, itemsQVector);
testQVector.clear();
foreach (int i, itemSet) {
for (int i : itemSet) {
testQVector.append(i);
}
QCOMPARE(testQVector, itemsQVector);