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

Make it more obviously wrong to use the Closure internals.

Browse Source
This commit is contained in:
John Maguire 2012-03-20 15:14:44 +01:00
parent c1c6aa099b
commit a09165c392
3 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/libclementine-common/core/closure.cpp
View File

@ -19,6 +19,8 @@
#include "core/logging.h"
namespace _detail {
Closure::Closure(QObject* sender,
const char* signal,
QObject* receiver,
@ -80,8 +82,10 @@ void Closure::Cleanup() {
deleteLater();
}
Closure* NewClosure(
} // namespace _detail
_detail::Closure* NewClosure(
QObject* sender, const char* signal,
QObject* receiver, const char* slot) {
return new Closure(sender, signal, receiver, slot);
return new _detail::Closure(sender, signal, receiver, slot);
}

45
ext/libclementine-common/core/closure.h
View File

@ -29,6 +29,8 @@
#include "core/logging.h"
namespace _detail {
class ClosureArgumentWrapper {
public:
virtual ~ClosureArgumentWrapper() {}
@ -39,7 +41,7 @@ class ClosureArgumentWrapper {
template<typename T>
class ClosureArgument : public ClosureArgumentWrapper {
public:
ClosureArgument(const T& data) : data_(data) {}
explicit ClosureArgument(const T& data) : data_(data) {}
virtual QGenericArgument arg() const {
return Q_ARG(T, data_);
@ -90,7 +92,7 @@ class SharedPointerWrapper {
template<typename T>
class SharedPointer : public SharedPointerWrapper {
public:
SharedPointer(QSharedPointer<T> ptr)
explicit SharedPointer(QSharedPointer<T> ptr)
: ptr_(ptr) {
}
@ -123,41 +125,43 @@ class SharedClosure : public Closure {
boost::scoped_ptr<SharedPointerWrapper> shared_sender_;
};
#define C_ARG(type, data) new ClosureArgument<type>(data)
} // namespace _detail
Closure* NewClosure(
#define C_ARG(type, data) new _detail::ClosureArgument<type>(data)
_detail::Closure* NewClosure(
QObject* sender,
const char* signal,
QObject* receiver,
const char* slot);
template <typename T>
Closure* NewClosure(
_detail::Closure* NewClosure(
QObject* sender,
const char* signal,
QObject* receiver,
const char* slot,
const T& val0) {
return new Closure(
return new _detail::Closure(
sender, signal, receiver, slot,
C_ARG(T, val0));
}
template <typename T0, typename T1>
Closure* NewClosure(
_detail::Closure* NewClosure(
QObject* sender,
const char* signal,
QObject* receiver,
const char* slot,
const T0& val0,
const T1& val1) {
return new Closure(
return new _detail::Closure(
sender, signal, receiver, slot,
C_ARG(T0, val0), C_ARG(T1, val1));
}
template <typename T0, typename T1, typename T2>
Closure* NewClosure(
_detail::Closure* NewClosure(
QObject* sender,
const char* signal,
QObject* receiver,
@ -165,13 +169,13 @@ Closure* NewClosure(
const T0& val0,
const T1& val1,
const T2& val2) {
return new Closure(
return new _detail::Closure(
sender, signal, receiver, slot,
C_ARG(T0, val0), C_ARG(T1, val1), C_ARG(T2, val2));
}
template <typename T0, typename T1, typename T2, typename T3>
Closure* NewClosure(
_detail::Closure* NewClosure(
QObject* sender,
const char* signal,
QObject* receiver,
@ -180,42 +184,43 @@ Closure* NewClosure(
const T1& val1,
const T2& val2,
const T3& val3) {
return new Closure(
return new _detail::Closure(
sender, signal, receiver, slot,
C_ARG(T0, val0), C_ARG(T1, val1), C_ARG(T2, val2), C_ARG(T3, val3));
}
template <typename TP>
Closure* NewClosure(
_detail::Closure* NewClosure(
QSharedPointer<TP> sender,
const char* signal,
QObject* receiver,
const char* slot) {
return new SharedClosure(new SharedPointer<TP>(sender), signal, receiver, slot);
return new _detail::SharedClosure(
new _detail::SharedPointer<TP>(sender), signal, receiver, slot);
}
template <typename TP, typename T0>
Closure* NewClosure(
_detail::Closure* NewClosure(
QSharedPointer<TP> sender,
const char* signal,
QObject* receiver,
const char* slot,
const T0& val0) {
return new SharedClosure(
new SharedPointer<TP>(sender), signal, receiver, slot,
return new _detail::SharedClosure(
new _detail::SharedPointer<TP>(sender), signal, receiver, slot,
C_ARG(T0, val0));
}
template <typename TP, typename T0, typename T1>
Closure* NewClosure(
_detail::Closure* NewClosure(
QSharedPointer<TP> sender,
const char* signal,
QObject* receiver,
const char* slot,
const T0& val0,
const T1& val1) {
return new SharedClosure(
new SharedPointer<TP>(sender), signal, receiver, slot,
return new _detail::SharedClosure(
new _detail::SharedPointer<TP>(sender), signal, receiver, slot,
C_ARG(T0, val0), C_ARG(T1, val1));
}

8
tests/closure_test.cpp
View File

@ -15,7 +15,7 @@ class ClosureTest : public ::testing::Test {
TEST_F(ClosureTest, ClosureInvokesReceiver) {
TestQObject sender;
TestQObject receiver;
Closure* closure = NewClosure(
_detail::Closure* closure = NewClosure(
&sender, SIGNAL(Emitted()),
&receiver, SLOT(Invoke()));
EXPECT_EQ(0, receiver.invoked());
@ -26,7 +26,7 @@ TEST_F(ClosureTest, ClosureInvokesReceiver) {
TEST_F(ClosureTest, ClosureDeletesSelf) {
TestQObject sender;
TestQObject receiver;
Closure* closure = NewClosure(
_detail::Closure* closure = NewClosure(
&sender, SIGNAL(Emitted()),
&receiver, SLOT(Invoke()));
QSignalSpy spy(closure, SIGNAL(destroyed()));
@ -45,11 +45,11 @@ TEST_F(ClosureTest, ClosureDoesNotCrashWithSharedPointerSender) {
TestQObject receiver;
TestQObject* sender;
boost::scoped_ptr<QSignalSpy> spy;
QPointer<Closure> closure;
QPointer<_detail::Closure> closure;
{
QSharedPointer<TestQObject> sender_shared(new TestQObject);
sender = sender_shared.data();
closure = QPointer<Closure>(NewClosure(
closure = QPointer<_detail::Closure>(NewClosure(
sender_shared, SIGNAL(Emitted()),
&receiver, SLOT(Invoke())));
spy.reset(new QSignalSpy(sender, SIGNAL(destroyed())));