-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 | |||
@@ -44,26 +44,30 @@ HEADERS = ../../library/calendar.h \ | |||
44 | ../../library/categorymenu.h \ | 44 | ../../library/categorymenu.h \ |
45 | ../../library/categoryedit_p.h \ | 45 | ../../library/categoryedit_p.h \ |
46 | ../../library/categoryselect.h \ | 46 | ../../library/categoryselect.h \ |
47 | ../../library/categorywidget.h \ | 47 | ../../library/categorywidget.h \ |
48 | ../../library/ir.h \ | 48 | ../../library/ir.h \ |
49 | ../../library/backend/vobject_p.h \ | 49 | ../../library/backend/vobject_p.h \ |
50 | ../../library/findwidget_p.h \ | 50 | ../../library/findwidget_p.h \ |
51 | ../../library/finddialog.h \ | 51 | ../../library/finddialog.h \ |
52 | ../../library/lnkproperties.h \ | 52 | ../../library/lnkproperties.h \ |
53 | ../../library/windowdecorationinterface.h \ | 53 | ../../library/windowdecorationinterface.h \ |
54 | ../../library/textcodecinterface.h \ | 54 | ../../library/textcodecinterface.h \ |
55 | ../../library/imagecodecinterface.h \ | 55 | ../../library/imagecodecinterface.h \ |
56 | qt/qcopchannel_qws.h \ | ||
56 | qpe/qpeapplication.h \ | 57 | qpe/qpeapplication.h \ |
57 | qpe/fontmanager.h | 58 | qpe/fontmanager.h \ |
59 | ../ipc/client/ocopclient.h \ | ||
60 | ../ipc/common/ocoppacket.h | ||
61 | |||
58 | 62 | ||
59 | SOURCES= ../../library/calendar.cpp \ | 63 | SOURCES= ../../library/calendar.cpp \ |
60 | ../../library/global.cpp \ | 64 | ../../library/global.cpp \ |
61 | ../../library/xmlreader.cpp \ | 65 | ../../library/xmlreader.cpp \ |
62 | ../../library/mimetype.cpp \ | 66 | ../../library/mimetype.cpp \ |
63 | ../../library/menubutton.cpp \ | 67 | ../../library/menubutton.cpp \ |
64 | ../../library/network.cpp \ | 68 | ../../library/network.cpp \ |
65 | ../../library/networkinterface.cpp \ | 69 | ../../library/networkinterface.cpp \ |
66 | ../../library/filemanager.cpp \ | 70 | ../../library/filemanager.cpp \ |
67 | ../../library/qdawg.cpp \ | 71 | ../../library/qdawg.cpp \ |
68 | ../../library/datebookmonth.cpp \ | 72 | ../../library/datebookmonth.cpp \ |
69 | ../../library/fileselector.cpp \ | 73 | ../../library/fileselector.cpp \ |
@@ -97,28 +101,41 @@ SOURCES = ../../library/calendar.cpp \ | |||
97 | ../../library/backend/task.cpp \ | 101 | ../../library/backend/task.cpp \ |
98 | ../../library/backend/event.cpp \ | 102 | ../../library/backend/event.cpp \ |
99 | ../../library/backend/contact.cpp \ | 103 | ../../library/backend/contact.cpp \ |
100 | ../../library/categorymenu.cpp \ | 104 | ../../library/categorymenu.cpp \ |
101 | ../../library/categoryedit_p.cpp \ | 105 | ../../library/categoryedit_p.cpp \ |
102 | ../../library/categoryselect.cpp \ | 106 | ../../library/categoryselect.cpp \ |
103 | ../../library/categorywidget.cpp \ | 107 | ../../library/categorywidget.cpp \ |
104 | ../../library/ir.cpp \ | 108 | ../../library/ir.cpp \ |
105 | ../../library/backend/vcc_yacc.cpp \ | 109 | ../../library/backend/vcc_yacc.cpp \ |
106 | ../../library/backend/vobject.cpp \ | 110 | ../../library/backend/vobject.cpp \ |
107 | ../../library/findwidget_p.cpp \ | 111 | ../../library/findwidget_p.cpp \ |
108 | ../../library/finddialog.cpp \ | 112 | ../../library/finddialog.cpp \ |
109 | ../../library/lnkproperties.cpp | 113 | ../../library/lnkproperties.cpp \ |
114 | qt/qcopchannel_qws.cpp \ | ||
115 | qpe/qpeapplication.cpp \ | ||
116 | ../ipc/client/ocopclient.cpp \ | ||
117 | ../ipc/common/ocoppacket.cpp | ||
110 | 118 | ||
111 | # Qt 3 compatibility | 119 | # Qt 3 compatibility |
112 | qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h | 120 | HEADERS += ../../library/quuid.h \ |
113 | qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp | 121 | ../../library/qcom.h \ |
122 | ../../library/qlibrary.h \ | ||
123 | ../../library/qlibrary_p.h | ||
124 | |||
125 | SOURCES += ../../library/quuid.cpp \ | ||
126 | ../../library/qlibrary.cpp \ | ||
127 | ../../library/qlibrary_unix.cpp | ||
128 | |||
114 | INCLUDEPATH += $(OPIEDIR)/include backend | 129 | INCLUDEPATH += $(OPIEDIR)/include backend |
115 | LIBS += -ldl -lcrypt -lm | 130 | LIBS += -ldl -lcrypt -lm |
131 | |||
116 | INTERFACES = ../../library/passwordbase_p.ui \ | 132 | INTERFACES = ../../library/passwordbase_p.ui \ |
117 | ../../library/categoryeditbase_p.ui \ | 133 | ../../library/categoryeditbase_p.ui \ |
118 | ../../library/findwidgetbase_p.ui \ | 134 | ../../library/findwidgetbase_p.ui \ |
119 | ../../library/lnkpropertiesbase_p.ui | 135 | ../../library/lnkpropertiesbase_p.ui |
136 | |||
120 | TARGET = qpe-x11 | 137 | TARGET = qpe-x11 |
121 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 138 | DESTDIR = $(QTDIR)/lib$(PROJMAK) |
122 | # This is set by configure$(OPIEDIR). | 139 | # This is set by configure$(OPIEDIR). |
123 | VERSION = 1.5.0.1 | 140 | VERSION = 1.5.0.1 |
124 | 141 | ||
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,14 +1,14 @@ | |||
1 | 1 | ||
2 | #include "../ipc/client/ocopclient.h" | 2 | #include "../../ipc/client/ocopclient.h" |
3 | 3 | ||
4 | #include <qcopchannel_qws.h> | 4 | #include <qcopchannel_qws.h> |
5 | 5 | ||
6 | QCopChannel::QCopChannel( const QCString& channel, QObject* parent, | 6 | QCopChannel::QCopChannel( const QCString& channel, QObject* parent, |
7 | const char* name ) | 7 | const char* name ) |
8 | : QObject( parent, name ),m_chan(channel) { | 8 | : QObject( parent, name ),m_chan(channel) { |
9 | init(); | 9 | init(); |
10 | } | 10 | } |
11 | QCopChannel::~QCopChannel() { | 11 | QCopChannel::~QCopChannel() { |
12 | m_client->delChannel( m_chan ); | 12 | m_client->delChannel( m_chan ); |
13 | delete m_client; | 13 | delete m_client; |
14 | } | 14 | } |
@@ -18,29 +18,29 @@ void QCopChannel::init() { | |||
18 | connect(m_client, SIGNAL(called(const QCString&, const QCString&, const QByteArray& ) ), | 18 | connect(m_client, SIGNAL(called(const QCString&, const QCString&, const QByteArray& ) ), |
19 | this, SLOT(rev(const QCString&, const QCString&, const QByteArray&) ) ); | 19 | this, SLOT(rev(const QCString&, const QCString&, const QByteArray&) ) ); |
20 | } | 20 | } |
21 | QCString QCopChannel::channel()const { | 21 | QCString QCopChannel::channel()const { |
22 | return m_chan; | 22 | return m_chan; |
23 | } | 23 | } |
24 | bool QCopChannel::isRegistered( const QCString& chan) { | 24 | bool QCopChannel::isRegistered( const QCString& chan) { |
25 | OCOPClient client; | 25 | OCOPClient client; |
26 | return client.isRegistered( chan ); | 26 | return client.isRegistered( chan ); |
27 | } | 27 | } |
28 | bool QCopChannel::send( const QCString& chan, const QCString& msg ) { | 28 | bool QCopChannel::send( const QCString& chan, const QCString& msg ) { |
29 | QByteArray ar(0); | 29 | QByteArray ar(0); |
30 | return return sendLocally(chan, msg, ar ); | 30 | return sendLocally(chan, msg, ar ); |
31 | } | 31 | } |
32 | bool QCString::send( const QCString& chan, const QCString& msg, | 32 | bool QCopChannel::send( const QCString& chan, const QCString& msg, |
33 | const QByteArray& ar ) { | 33 | const QByteArray& ar ) { |
34 | return sendLocally( chan, msg, ar ); | 34 | return sendLocally( chan, msg, ar ); |
35 | } | 35 | } |
36 | bool QCopChannel::sendLocally( const QCString& chan, const QCString& msg, | 36 | bool QCopChannel::sendLocally( const QCString& chan, const QCString& msg, |
37 | const QByteArray& ar ) { | 37 | const QByteArray& ar ) { |
38 | OCOPClient client; | 38 | OCOPClient client; |
39 | client.send( chan, msg, ar ); | 39 | client.send( chan, msg, ar ); |
40 | 40 | ||
41 | return true; | 41 | return true; |
42 | } | 42 | } |
43 | void QCopChannel::rev( const QCString& chan, const QCString& msg, const QByteArray& ar ) { | 43 | void QCopChannel::rev( const QCString& chan, const QCString& msg, const QByteArray& ar ) { |
44 | if (chan == m_chan ) | 44 | if (chan == m_chan ) |
45 | emit received(chan, msg, ar ); | 45 | emit received(msg, ar ); |
46 | } | 46 | } |