Fix 5 clazy warnings

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

REVIEW: 129604

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d5c1c0459e58464313403842fe352b9d099fcab..814c00ff22f5b9548d4feae980ddd883339b26ea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 (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")
 
 set(KF5_MIN_VERSION "5.21.0")
 set(ECM_MIN_VERSION "1.6.0")
 

diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h
index b8a93edacbaeaccf382971dc17d299bcda8c6dc8..5e5e6b7c3eedc2a142552bd4c44ac635811a3b21 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.h
+++ b/src/kitemviews/kitemlistcontroller.h
@@ -59,7 +59,6 @@ class QTransform;
 class DOLPHIN_EXPORT KItemListController : public QObject
 {
     Q_OBJECT
 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)
     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
     };
         SingleSelection,
         MultiSelection
     };

+    Q_ENUM(SelectionBehavior)

 
     enum AutoActivationBehavior {
         ActivationAndExpansion,
 
     enum AutoActivationBehavior {
         ActivationAndExpansion,

diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
index 6c45e114b65166888322936b842adc2aad7a155e..ac15693b6b6cdc654fa02011d1ce4e456b1611ba 100644 (file)
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@ -154,9 +154,9 @@ void KFileItemModelTest::testDefaultSortRole()
     QVERIFY(itemsInsertedSpy.wait());
 
     QCOMPARE(m_model->count(), 3);
     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()
 }
 
 void KFileItemModelTest::testDefaultGroupedSorting()

diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp
index 0d14e20fa62f785cf2b2fd69f134a91ab3633d90..f559475a60218a415b1060622d7d268eef52367c 100644 (file)
--- a/src/tests/kitemsettest.cpp
+++ b/src/tests/kitemsettest.cpp
@@ -72,14 +72,14 @@ QVector<int> KItemRangeList2QVector(const KItemRangeList& itemRanges)
 static QSet<int> KItemSet2QSet(const KItemSet& itemSet)
 {
     QSet<int> result;
 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());
 
         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));
     }
 
         Q_ASSERT(result.contains(i));
     }
 


@@ -239,7 +239,7 @@ void KItemSetTest::testIterators()
     QCOMPARE(testQVector, itemsQVector);
 
     testQVector.clear();
     QCOMPARE(testQVector, itemsQVector);
 
     testQVector.clear();

-    foreach (int i, itemSet) {
+    for (int i : itemSet) {

         testQVector.append(i);
     }
     QCOMPARE(testQVector, itemsQVector);
         testQVector.append(i);
     }
     QCOMPARE(testQVector, itemsQVector);