mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 17:14:00 +02:00
Code Issues Releases Wiki Activity

Use unique_ptr instead of QScopedPointer in Closure

Browse Source
This commit is contained in:
Uwe L. Korn
2014-10-18 00:08:55 +02:00
parent bf32273ef5
commit 8eabbced5c
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/libtomahawk/utils/Closure.h
View File

@@ -27,9 +27,9 @@
#include <QMetaMethod> #include <QMetaMethod>
#include <QObject> #include <QObject>
#include <QPointer> #include <QPointer>
#include <QSharedPointer>
#include <functional> #include <functional>
#include <memory>
namespace _detail { namespace _detail {
@@ -59,10 +59,10 @@ class DLLEXPORT Closure : public QObject {
public: public:
Closure(QObject* sender, const char* signal, Closure(QObject* sender, const char* signal,
QObject* receiver, const char* slot, QObject* receiver, const char* slot,
const ClosureArgumentWrapper* val0 = 0, const ClosureArgumentWrapper* val0 = nullptr,
const ClosureArgumentWrapper* val1 = 0, const ClosureArgumentWrapper* val1 = nullptr,
const ClosureArgumentWrapper* val2 = 0, const ClosureArgumentWrapper* val2 = nullptr,
const ClosureArgumentWrapper* val3 = 0); const ClosureArgumentWrapper* val3 = nullptr);
Closure(QObject* sender, const char* signal, Closure(QObject* sender, const char* signal,
std::function<void()> callback); std::function<void()> callback);
@@ -94,10 +94,10 @@ class DLLEXPORT Closure : public QObject {
bool autoDelete_; bool autoDelete_;
QPointer<QObject> outOfThreadReceiver_; QPointer<QObject> outOfThreadReceiver_;
QScopedPointer<const ClosureArgumentWrapper> val0_; std::unique_ptr<const ClosureArgumentWrapper> val0_;
QScopedPointer<const ClosureArgumentWrapper> val1_; std::unique_ptr<const ClosureArgumentWrapper> val1_;
QScopedPointer<const ClosureArgumentWrapper> val2_; std::unique_ptr<const ClosureArgumentWrapper> val2_;
QScopedPointer<const ClosureArgumentWrapper> val3_; std::unique_ptr<const ClosureArgumentWrapper> val3_;
}; };
class DLLEXPORT SharedPointerWrapper { class DLLEXPORT SharedPointerWrapper {
@@ -128,10 +128,10 @@ class SharedClosure : public Closure {
public: public:
SharedClosure(SharedPointerWrapper* sender, const char* signal, SharedClosure(SharedPointerWrapper* sender, const char* signal,
QObject* receiver, const char* slot, QObject* receiver, const char* slot,
const ClosureArgumentWrapper* val0 = 0, const ClosureArgumentWrapper* val0 = nullptr,
const ClosureArgumentWrapper* val1 = 0, const ClosureArgumentWrapper* val1 = nullptr,
const ClosureArgumentWrapper* val2 = 0, const ClosureArgumentWrapper* val2 = nullptr,
const ClosureArgumentWrapper* val3 = 0) const ClosureArgumentWrapper* val3 = nullptr)
: Closure(sender->data(), signal, : Closure(sender->data(), signal,
receiver, slot, receiver, slot,
val0, val1, val2, val3), val0, val1, val2, val3),
@@ -139,7 +139,7 @@ class SharedClosure : public Closure {
} }
private: private:
QScopedPointer<SharedPointerWrapper> shared_sender_; std::unique_ptr<SharedPointerWrapper> shared_sender_;
}; };
} // namespace _detail } // namespace _detail
@@ -208,7 +208,7 @@ _detail::Closure* NewClosure(
template <typename TP> template <typename TP>
_detail::Closure* NewClosure( _detail::Closure* NewClosure(
QSharedPointer<TP> sender, std::unique_ptr<TP> sender,
const char* signal, const char* signal,
QObject* receiver, QObject* receiver,
const char* slot) { const char* slot) {