Remove the old qtjolie fork, and copy in the current qtjolie, since that one now has all the features remote widgets require.

svn path=/trunk/KDE/kdelibs/; revision=1023804

private/qtjolie-branch/CMakeLists.txt

@@ -1,3 +0,0 @@
-add_subdirectory(qtjolie)
-add_subdirectory(includes)
-#add_subdirectory(tests)

private/qtjolie-branch/qtjolie/qtjolie.diff

@@ -1,111 +0,0 @@
-Index: server.cpp
-===================================================================
---- server.cpp	(revision 985276)
-+++ server.cpp	(working copy)
-@@ -22,6 +22,7 @@
- #include "server_p.h"
- 
- #include <QtCore/QDebug>
-+#include <QtCore/QString>
- 
- #include "abstractadaptor.h"
- #include "serverthread_p.h"
-@@ -56,11 +57,13 @@
- 
- bool Server::registerAdaptor(const QByteArray &path, AbstractAdaptor *adaptor)
- {
-+    //qDebug() << "registering an adaptor: " << QString(path);
-     if (path.isEmpty() || d->adaptors.contains(path)) {
-         return false;
-     }
- 
-     d->adaptors[path] = adaptor;
-+    return true;
- }
- 
- bool Server::unregisterAdaptor(const QByteArray &path)
-@@ -68,11 +71,16 @@
-     return d->adaptors.take(path)!=0;
- }
- 
-+void Server::sendMessage(int descriptor, const Message &message)
-+{
-+    d->serverThread->sendMessage(descriptor, message);
-+}
-+
- void ServerPrivate::messageReceived(int descriptor, const Message &message)
- {
-     if (adaptors.contains(message.resourcePath())) {
--        Message reply = adaptors[message.resourcePath()]->relay(q, message);
--        serverThread->sendMessage(descriptor, reply);
-+        adaptors[message.resourcePath()]->relay(q, descriptor, message);
-+        //serverThread->sendMessage(descriptor, reply);
-     } else {
-         qWarning() << "Got a message for an unregistered object:"
-                    << message.operationName()
-Index: sodephelpers_p.h
-===================================================================
---- sodephelpers_p.h	(revision 985276)
-+++ sodephelpers_p.h	(working copy)
-@@ -193,7 +193,7 @@
-     io.read(data, length);
-     data[length] = '\0';
- 
--    QByteArray result(data);
-+    QByteArray result(data, length);
-     delete[] data;
- 
-     return result;
-Index: abstractadaptor.h
-===================================================================
---- abstractadaptor.h	(revision 985276)
-+++ abstractadaptor.h	(working copy)
-@@ -40,7 +40,7 @@
- 
- 
- private:
--    virtual Message relay(Server *server, const Message &message) = 0;
-+    virtual void relay(Server *server, int descriptor, const Message &message) = 0;
- 
-     friend class ServerPrivate;
- 
-Index: QtJolie.prf.cmake
-===================================================================
---- QtJolie.prf.cmake	(revision 985276)
-+++ QtJolie.prf.cmake	(working copy)
-@@ -5,9 +5,9 @@
- INCLUDEPATH += $$QTJOLIE_INCDIR
- LIBS += -L$$QTJOLIE_LIBDIR
- 
--LINKAGE = -llibQtJolie
-+LINKAGE = -lQtJolie
- CONFIG(debug, debug|release) {
--	windows:LINKAGE = -llibQtJolied
--	mac:LINKAGE = -llibQtJolie_debug
-+	windows:LINKAGE = -lQtJolied
-+	mac:LINKAGE = -lQtJolie_debug
- }
- LIBS += $$LINKAGE
-Index: QtJolie.pc.cmake
-===================================================================
---- QtJolie.pc.cmake	(revision 985276)
-+++ QtJolie.pc.cmake	(working copy)
-@@ -7,5 +7,5 @@
- Description: A QtDbus like API for JOLIE
- Version: 1.0.0
- Requires: QtCore
--Libs: -L${libdir} -llibQtJolie
-+Libs: -L${libdir} -lQtJolie
- Cflags: -I${includedir}
-Index: server.h
-===================================================================
---- server.h	(revision 985276)
-+++ server.h	(working copy)
-@@ -47,6 +47,7 @@
- 
-     bool registerAdaptor(const QByteArray &path, AbstractAdaptor *adaptor);
-     bool unregisterAdaptor(const QByteArray &path);
-+    void sendMessage(int descriptor, const Message &message);
- 
- private:
-     friend class ServerPrivate;

private/qtjolie/CMakeLists.txt

@@ -0,0 +1,10 @@
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+
+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
+
+add_subdirectory(qtjolie)
+add_subdirectory(includes)
+add_subdirectory(tests)

private/qtjolie/qtjolie/QtJolie.pc.cmake

@@ -7,5 +7,5 @@ Name: QtJolie
 Description: A QtDbus like API for JOLIE
 Version: 1.0.0
 Requires: QtCore
-Libs: -L${libdir} -lQtJolie
+Libs: -L${libdir} -llibQtJolie
 Cflags: -I${includedir}

private/qtjolie/qtjolie/QtJolie.prf.cmake

@@ -5,9 +5,9 @@ CONFIG *= qt
 INCLUDEPATH += $$QTJOLIE_INCDIR
 LIBS += -L$$QTJOLIE_LIBDIR
 
-LINKAGE = -lQtJolie
+LINKAGE = -llibQtJolie
 CONFIG(debug, debug|release) {
-	windows:LINKAGE = -lQtJolied
+	windows:LINKAGE = -llibQtJolied
-	mac:LINKAGE = -lQtJolie_debug
+	mac:LINKAGE = -llibQtJolie_debug
 }
 LIBS += $$LINKAGE

private/qtjolie/qtjolie/client.cpp

@@ -26,9 +26,6 @@
 #include "pendingcall.h"
 #include "pendingreply.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 Client::Client(const QString &hostName, quint16 port)

private/qtjolie/qtjolie/clientthread.cpp

@@ -26,9 +26,6 @@
 #include "message.h"
 #include "sodephelpers_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 ClientThread::ClientThread(const QString &hostName, quint16 port, ClientPrivate *client)

private/qtjolie/qtjolie/fault.cpp

@@ -24,9 +24,6 @@
 
 #include "sodephelpers_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 namespace Jolie
 {
 

private/qtjolie/qtjolie/message.cpp

@@ -24,9 +24,6 @@
 
 #include "sodephelpers_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 namespace Jolie
 {
 

private/qtjolie/qtjolie/metaservice.cpp

@@ -25,9 +25,6 @@
 #include "client.h"
 #include "message.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 namespace Jolie
 {
 

private/qtjolie/qtjolie/pendingcall.cpp

@@ -22,9 +22,6 @@
 #include "pendingcall_p.h"
 #include "pendingcallwatcher.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 PendingCall::PendingCall(const PendingCall &other)

private/qtjolie/qtjolie/pendingcallwatcher.cpp

@@ -22,9 +22,6 @@
 
 #include "pendingcall_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 PendingCallWatcher::PendingCallWatcher(const PendingCall &other, QObject *parent)

private/qtjolie/qtjolie/pendingreply.cpp

@@ -22,9 +22,6 @@
 
 #include "pendingcall_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 PendingReply::PendingReply()

private/qtjolie/qtjolie/serverthread.cpp

@@ -27,9 +27,6 @@
 #include "message.h"
 #include "sodephelpers_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 Q_DECLARE_METATYPE(QAbstractSocket*)

private/qtjolie/qtjolie/value.cpp

@@ -24,9 +24,6 @@
 
 #include "sodephelpers_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 namespace Jolie
 {