]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Fix clazy non-pod-global-static warning
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 9 Nov 2019 18:42:57 +0000 (19:42 +0100)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 9 Nov 2019 21:09:16 +0000 (22:09 +0100)
This list of URLs is only used by cleanupBookmarks(), so there is no
need to make it global (which is what clazy complains about).

While at it, make it also a `const QVector`.

src/panels/places/placesitemmodel.cpp

index c0cef9315c9d17379dad3b403af4e25c6d94bbdf..4a91ec6d8bb1ba7777de1d006af64d17787d8c54 100644 (file)
 #include <QMimeData>
 #include <QTimer>
 
-namespace {
-    static QList<QUrl> balooURLs = {
-        QUrl(QStringLiteral("timeline:/today")),
-        QUrl(QStringLiteral("timeline:/yesterday")),
-        QUrl(QStringLiteral("timeline:/thismonth")),
-        QUrl(QStringLiteral("timeline:/lastmonth")),
-        QUrl(QStringLiteral("search:/documents")),
-        QUrl(QStringLiteral("search:/images")),
-        QUrl(QStringLiteral("search:/audio")),
-        QUrl(QStringLiteral("search:/videos"))
-    };
-}
-
 PlacesItemModel::PlacesItemModel(QObject* parent) :
     KStandardItemModel(parent),
     m_hiddenItemsShown(false),
@@ -627,6 +614,18 @@ void PlacesItemModel::cleanupBookmarks()
 {
     // KIO model now provides support for baloo urls, and because of that we
     // need to remove old URLs that were visible only in Dolphin to avoid duplication
+
+    static const QVector<QUrl> balooURLs = {
+        QUrl(QStringLiteral("timeline:/today")),
+        QUrl(QStringLiteral("timeline:/yesterday")),
+        QUrl(QStringLiteral("timeline:/thismonth")),
+        QUrl(QStringLiteral("timeline:/lastmonth")),
+        QUrl(QStringLiteral("search:/documents")),
+        QUrl(QStringLiteral("search:/images")),
+        QUrl(QStringLiteral("search:/audio")),
+        QUrl(QStringLiteral("search:/videos"))
+    };
+
     int row = 0;
     do {
         const QModelIndex sourceIndex = m_sourceModel->index(row, 0);