From e69032b551aa83f6fd04a05226f15b28f9ef89a1 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@gmail.com>
Date: Fri, 24 Apr 2015 20:01:49 -0400
Subject: [PATCH] osx: remove platform dependent code
New version packaged with Xcode fixed initial issue
LLVM version required is 3.6.0svn
---
src/collectionmanagerinterface.h | 7 -------
src/collectionmanagerinterface.hpp | 30 ------------------------------
2 files changed, 37 deletions(-)
diff --git a/src/collectionmanagerinterface.h b/src/collectionmanagerinterface.h
index 6108379d..78bc5fc3 100644
--- a/src/collectionmanagerinterface.h
+++ b/src/collectionmanagerinterface.h
@@ -108,13 +108,6 @@ public:
explicit CollectionManagerInterface(QAbstractItemModel* self);
virtual ~CollectionManagerInterface() {};
-#ifdef Q_OS_DARWIN
- /*
- * Issue with LLVM 3.5svn shipped in Mac OSX with variadic template
- */
- template <class T2>
- T2* addCollection(const LoadOptions options = LoadOptions::NONE);
-#endif
/**
* This method is used to add a collection to a model. The LoadOptions
* can be used to enforce some parameters. Please note this function is
diff --git a/src/collectionmanagerinterface.hpp b/src/collectionmanagerinterface.hpp
index 7c2c0005..a17da5dd 100644
--- a/src/collectionmanagerinterface.hpp
+++ b/src/collectionmanagerinterface.hpp
@@ -52,36 +52,6 @@ CollectionManagerInterfacePrivate<T>::~CollectionManagerInterfacePrivate()
delete m_pMediator;
}
-#ifdef Q_OS_DARWIN
-template<class T>
-template <class T2>
-T2* CollectionManagerInterface<T>::addCollection(const LoadOptions options)
-{
- T2* backend = new T2(d_ptr->itemMediator());
-
- //This will force the T2 to be a CollectionInterface subclass
- CollectionInterface* b = backend;
- d_ptr->m_lCollections << b;
-
- setCollectionConfigurator(backend,[this]() {
- return registerConfigarator<T2>();
- });
-
- if (options & LoadOptions::FORCE_ENABLED) { //TODO check is the backend is checked
-
- //Some backends can fail to load directly
- //eventually it will necessary to add an async version of this
- //to load the backend only when it is loaded
- if (backend->load())
- d_ptr->m_lEnabledCollections << backend;
- }
-
- registerToModel(backend);
-
- return backend;
-}
-#endif
-
template<class T>
template <class T2, typename ...Ts>
T2* CollectionManagerInterface<T>::addCollection(Ts... args, const LoadOptions options)
--
GitLab