summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-16 14:28:58 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-16 14:28:58 (GMT)
commit7321f7fcf1d89f015659edecf32956eccd8442a0 (patch)
treed38db182749c66f5fe1a7a7cc55762f9eda96b8a
parent387d8fe88537aa856f0835ab4adfb8742c5bb3dc (diff)
Add Marble namespace to KDescendantsProxyModel copy
-rw-r--r--src/lib/marble/kdescendantsproxymodel.cpp5
-rw-r--r--src/lib/marble/kdescendantsproxymodel.h10
2 files changed, 13 insertions, 2 deletions
diff --git a/src/lib/marble/kdescendantsproxymodel.cpp b/src/lib/marble/kdescendantsproxymodel.cpp
index 9b5239a..620af73 100644
--- a/src/lib/marble/kdescendantsproxymodel.cpp
+++ b/src/lib/marble/kdescendantsproxymodel.cpp
@@ -27,6 +27,9 @@
#include "kbihash_p.h"
+namespace Marble
+{
+
typedef KHash2Map<QPersistentModelIndex, int> Mapping;
class KDescendantsProxyModelPrivate
@@ -984,4 +987,6 @@ Qt::DropActions KDescendantsProxyModel::supportedDropActions() const
return sourceModel()->supportedDropActions();
}
+}
+
#include "moc_kdescendantsproxymodel.cpp"
diff --git a/src/lib/marble/kdescendantsproxymodel.h b/src/lib/marble/kdescendantsproxymodel.h
index eeb40e1..3f0c2bb 100644
--- a/src/lib/marble/kdescendantsproxymodel.h
+++ b/src/lib/marble/kdescendantsproxymodel.h
@@ -17,13 +17,17 @@
02110-1301, USA.
*/
-#ifndef KDESCENDANTSPROXYMODEL_P_H
-#define KDESCENDANTSPROXYMODEL_P_H
+#ifndef MARBLE_KDESCENDANTSPROXYMODEL_H
+#define MARBLE_KDESCENDANTSPROXYMODEL_H
#include <QAbstractProxyModel>
#include "marble_export.h"
+// namespace added to avoid symbol clashes with KF5::ItemModels
+namespace Marble
+{
+
class KDescendantsProxyModelPrivate;
/**
@@ -205,4 +209,6 @@ private:
//@endcond
};
+}
+
#endif