Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a closure variant using tr1::function. This may break the build...

Browse Source
This commit is contained in:
John Maguire 2011-10-05 14:55:39 +02:00
parent a0314d34fb
commit e77de84451
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/closure.cpp
View File

@ -26,6 +26,7 @@ Closure::Closure(QObject* sender,
const ClosureArgumentWrapper* val0,
const ClosureArgumentWrapper* val1)
: QObject(receiver),
callback_(NULL),
val0_(val0),
val1_(val1) {
const QMetaObject* meta_receiver = receiver->metaObject();
@ -38,11 +39,23 @@ Closure::Closure(QObject* sender,
connect(sender, SIGNAL(destroyed()), SLOT(Cleanup()));
}
Closure::Closure(QObject* sender,
const char* signal,
std::tr1::function<void()> callback)
: callback_(callback) {
connect(sender, signal, SLOT(Invoked()));
connect(sender, SIGNAL(destroyed()), SLOT(Cleanup()));
}
void Closure::Invoked() {
slot_.invoke(
parent(),
val0_ ? val0_->arg() : QGenericArgument(),
val1_ ? val1_->arg() : QGenericArgument());
if (callback_) {
callback_();
} else {
slot_.invoke(
parent(),
val0_ ? val0_->arg() : QGenericArgument(),
val1_ ? val1_->arg() : QGenericArgument());
}
deleteLater();
}

6
src/core/closure.h
View File

@ -18,6 +18,8 @@
#ifndef CLOSURE_H
#define CLOSURE_H
#include <tr1/functional>
#include <QMetaMethod>
#include <QObject>
@ -54,12 +56,16 @@ class Closure : public QObject {
const ClosureArgumentWrapper* val0 = 0,
const ClosureArgumentWrapper* val1 = 0);
Closure(QObject* sender, const char* signal,
std::tr1::function<void()> callback);
private slots:
void Invoked();
void Cleanup();
private:
QMetaMethod slot_;
std::tr1::function<void()> callback_;
boost::scoped_ptr<const ClosureArgumentWrapper> val0_;
boost::scoped_ptr<const ClosureArgumentWrapper> val1_;