| -rw-r--r-- | x11/libqpe-x11/libqpe-x11.pro | 25 | ||||
| -rw-r--r-- | x11/libqpe-x11/qt/qcopchannel_qws.cpp | 8 |
2 files changed, 25 insertions, 8 deletions
diff --git a/x11/libqpe-x11/libqpe-x11.pro b/x11/libqpe-x11/libqpe-x11.pro index 1d30f90..64c05fa 100644 --- a/x11/libqpe-x11/libqpe-x11.pro +++ b/x11/libqpe-x11/libqpe-x11.pro @@ -54,6 +54,10 @@ HEADERS = ../../library/calendar.h \ ../../library/textcodecinterface.h \ ../../library/imagecodecinterface.h \ + qt/qcopchannel_qws.h \ qpe/qpeapplication.h \ - qpe/fontmanager.h + qpe/fontmanager.h \ + ../ipc/client/ocopclient.h \ + ../ipc/common/ocoppacket.h + SOURCES = ../../library/calendar.cpp \ @@ -107,15 +111,28 @@ SOURCES = ../../library/calendar.cpp \ ../../library/findwidget_p.cpp \ ../../library/finddialog.cpp \ - ../../library/lnkproperties.cpp + ../../library/lnkproperties.cpp \ + qt/qcopchannel_qws.cpp \ + qpe/qpeapplication.cpp \ + ../ipc/client/ocopclient.cpp \ + ../ipc/common/ocoppacket.cpp # Qt 3 compatibility -qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h -qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp +HEADERS += ../../library/quuid.h \ + ../../library/qcom.h \ + ../../library/qlibrary.h \ + ../../library/qlibrary_p.h + +SOURCES += ../../library/quuid.cpp \ + ../../library/qlibrary.cpp \ + ../../library/qlibrary_unix.cpp + INCLUDEPATH += $(OPIEDIR)/include backend LIBS += -ldl -lcrypt -lm + INTERFACES = ../../library/passwordbase_p.ui \ ../../library/categoryeditbase_p.ui \ ../../library/findwidgetbase_p.ui \ ../../library/lnkpropertiesbase_p.ui + TARGET = qpe-x11 DESTDIR = $(QTDIR)/lib$(PROJMAK) diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.cpp b/x11/libqpe-x11/qt/qcopchannel_qws.cpp index efbef3f..c315d66 100644 --- a/x11/libqpe-x11/qt/qcopchannel_qws.cpp +++ b/x11/libqpe-x11/qt/qcopchannel_qws.cpp @@ -1,4 +1,4 @@ -#include "../ipc/client/ocopclient.h" +#include "../../ipc/client/ocopclient.h" #include <qcopchannel_qws.h> @@ -28,7 +28,7 @@ bool QCopChannel::isRegistered( const QCString& chan) { bool QCopChannel::send( const QCString& chan, const QCString& msg ) { QByteArray ar(0); - return return sendLocally(chan, msg, ar ); + return sendLocally(chan, msg, ar ); } -bool QCString::send( const QCString& chan, const QCString& msg, +bool QCopChannel::send( const QCString& chan, const QCString& msg, const QByteArray& ar ) { return sendLocally( chan, msg, ar ); @@ -43,4 +43,4 @@ bool QCopChannel::sendLocally( const QCString& chan, const QCString& msg, void QCopChannel::rev( const QCString& chan, const QCString& msg, const QByteArray& ar ) { if (chan == m_chan ) - emit received(chan, msg, ar ); + emit received(msg, ar ); } |