alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Declare the meta types in the library itself.

Browse Source 
svn path=/branches/work/~ervin/qtjolie/; revision=977803
This commit is contained in:
Kevin Ottens 2009-06-05 14:11:02 +00:00
parent 64d02688f9
commit c379e586bb
8 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
private/qtjolie-branch/qtjolie/fault.cpp
View File

@ -38,6 +38,8 @@ public:
using namespace Jolie;
static int _qtjolie_faultTypeId = qRegisterMetaType<Fault>();
Fault::Fault()
: d(new FaultPrivate)
{

4
private/qtjolie-branch/qtjolie/fault.h
View File

@ -23,6 +23,8 @@
#include <qtjolie/value.h>
#include <QtCore/QMetaType>
namespace Jolie
{
class FaultPrivate;
@ -50,5 +52,7 @@ private:
} // namespace Jolie
Q_DECLARE_METATYPE(Jolie::Fault);
#endif

2
private/qtjolie-branch/qtjolie/message.cpp
View File

@ -43,6 +43,8 @@ public:
using namespace Jolie;
static int _qtjolie_messageTypeId = qRegisterMetaType<Message>();
Message::Message()
: d(new MessagePrivate)
{

4
private/qtjolie-branch/qtjolie/message.h
View File

@ -24,6 +24,8 @@
#include <qtjolie/value.h>
#include <qtjolie/fault.h>
#include <QtCore/QMetaType>
namespace Jolie
{
class MessagePrivate;
@ -59,5 +61,7 @@ private:
} // namespace Jolie
Q_DECLARE_METATYPE(Jolie::Message);
#endif

2
private/qtjolie-branch/qtjolie/value.cpp
View File

@ -38,6 +38,8 @@ public:
using namespace Jolie;
static int _qtjolie_valueTypeId = qRegisterMetaType<Value>();
Value::Value()
: d(new ValuePrivate)
{

3
private/qtjolie-branch/qtjolie/value.h
View File

@ -23,6 +23,7 @@
#include <QtCore/QIODevice>
#include <QtCore/QList>
#include <QtCore/QMetaType>
namespace Jolie
{
@ -63,5 +64,7 @@ private:
} // namespace Jolie
Q_DECLARE_METATYPE(Jolie::Value)
#endif

6
private/qtjolie-branch/tests/testhelpers.h
View File

@ -28,8 +28,6 @@
#include <QtJolie/Value>
#include "../qtjolie/sodephelpers_p.h"
Q_DECLARE_METATYPE(Jolie::Value);
inline void sodepCompare(const Jolie::Value &v1, const Jolie::Value &v2)
{
QCOMPARE(v1.isValid(), v2.isValid());
@ -58,8 +56,6 @@ inline void sodepCompare(const Jolie::Value &v1, const Jolie::Value &v2)
}
}
Q_DECLARE_METATYPE(Jolie::Fault);
inline void sodepCompare(const Jolie::Fault &f1, const Jolie::Fault &f2)
{
QCOMPARE(f1.isValid(), f2.isValid());
@ -67,8 +63,6 @@ inline void sodepCompare(const Jolie::Fault &f1, const Jolie::Fault &f2)
sodepCompare(f1.data(), f2.data());
}
Q_DECLARE_METATYPE(Jolie::Message);
inline void sodepCompare(const Jolie::Message &m1, const Jolie::Message &m2)
{
QCOMPARE(m1.resourcePath(), m2.resourcePath());

1
private/qtjolie-branch/tests/testmetaservice.cpp
View File

@ -74,7 +74,6 @@ public:
TestMetaService()
: QObject()
{
qRegisterMetaType<Message>();
}
private slots: