Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 18:23:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed Singleton Dependency macro and tweaked DM

Browse source
This commit is contained in:
Atlante45 2014-12-18 15:42:03 -08:00
parent 9c038d33b9
commit f2847cec06
1 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libraries/shared/src/DependencyManager.h
View file

@ -16,27 +16,23 @@
#include <typeinfo>
#define SINGLETON_DEPENDENCY(T, NEED_SET)\
public:\
typedef QSharedPointer<T> SharedPointer;\
typedef QWeakPointer<T> WeakPointer;\
private:\
static const bool REQUIRE_SET = NEED_SET;\
void customDeleter() {\
QObject* thisObject = dynamic_cast<QObject*>(this);\
if (thisObject) {\
thisObject->deleteLater();\
} else {\
delete this;\
}\
}\
#define SINGLETON_DEPENDENCY \
private: \
virtual void customDeleter() { \
QObject* thisObject = dynamic_cast<QObject*>(this); \
if (thisObject) { \
thisObject->deleteLater(); \
} else { \
delete this; \
} \
} \
friend class DependencyManager;
class QObject;
// usage:
// T* instance = DependencyManager::get<T>();
// T* instance = DependencyManager::set<T, Type1, Type2, ...>(Args... args);
// T* instance = DependencyManager::set<T>(Args... args);
// T* instance = DependencyManager::destroy<T>();
class DependencyManager {
public:
@ -56,12 +52,6 @@ private:
template <typename T>
QSharedPointer<T> DependencyManager::get() {
static bool requireSet = !T::REQUIRE_SET;
if (requireSet) {
set<T>();
requireSet = false;
}
return storage<T>();
}