Skip to content
Snippets Groups Projects
Commit e69032b5 authored by Alexandre Lision's avatar Alexandre Lision
Browse files

osx: remove platform dependent code

New version packaged with Xcode fixed initial issue
LLVM version required is 3.6.0svn
parent a059497d
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment