-rw-r--r-- | noncore/graphics/opie-eye/slave/slavereciever.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp index fb88873..941a5df 100644 --- a/noncore/graphics/opie-eye/slave/slavereciever.cpp +++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp | |||
@@ -41,7 +41,7 @@ QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) { | |||
41 | */ | 41 | */ |
42 | QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { | 42 | QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) { |
43 | s >> inf.file >> inf.width >> inf.height; | 43 | s >> inf.file >> inf.width >> inf.height; |
44 | owarn << "Recieved " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; | 44 | owarn << "Recieved " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; |
45 | return s; | 45 | return s; |
46 | } | 46 | } |
47 | QDataStream &operator<<( QDataStream& s, const ImageInfo& i) { | 47 | QDataStream &operator<<( QDataStream& s, const ImageInfo& i) { |
@@ -86,7 +86,7 @@ SlaveReciever::~SlaveReciever() { | |||
86 | } | 86 | } |
87 | 87 | ||
88 | void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) { | 88 | void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) { |
89 | owarn << "String is " << string.data() << "" << oendl; | 89 | owarn << "String is " << string.data() << "" << oendl; |
90 | QDataStream stream(ar, IO_ReadOnly ); | 90 | QDataStream stream(ar, IO_ReadOnly ); |
91 | QStringList lst; | 91 | QStringList lst; |
92 | static ImageInfo inf; | 92 | static ImageInfo inf; |
@@ -94,12 +94,14 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
94 | 94 | ||
95 | if ( string == "thumbInfo(QString)" ) { | 95 | if ( string == "thumbInfo(QString)" ) { |
96 | stream >> inf.file; | 96 | stream >> inf.file; |
97 | inf.kind = false; | ||
97 | m_inList.append(inf); | 98 | m_inList.append(inf); |
98 | }else if ( string == "thumbInfos(QStringList)" ) { | 99 | }else if ( string == "thumbInfos(QStringList)" ) { |
99 | stream >> lst; | 100 | stream >> lst; |
100 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { | 101 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { |
101 | owarn << "Adding thumbinfo for file "+ *it << oendl; | 102 | owarn << "Adding thumbinfo for file "+ *it << oendl; |
102 | inf.file = (*it); | 103 | inf.file = (*it); |
104 | inf.kind = false; | ||
103 | m_inList.append(inf); | 105 | m_inList.append(inf); |
104 | } | 106 | } |
105 | }else if ( string == "fullInfo(QString)" ) { | 107 | }else if ( string == "fullInfo(QString)" ) { |
@@ -109,7 +111,7 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
109 | }else if ( string == "fullInfos(QStringList)" ) { | 111 | }else if ( string == "fullInfos(QStringList)" ) { |
110 | stream >> lst; | 112 | stream >> lst; |
111 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { | 113 | for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { |
112 | owarn << "Adding fullInfo for"+ *it << oendl; | 114 | owarn << "Adding fullInfo for"+ *it << oendl; |
113 | inf.file = (*it); | 115 | inf.file = (*it); |
114 | inf.kind = true; | 116 | inf.kind = true; |
115 | m_inList.append(inf); | 117 | m_inList.append(inf); |
@@ -121,7 +123,7 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) | |||
121 | PixmapList list; | 123 | PixmapList list; |
122 | stream >> list; | 124 | stream >> list; |
123 | for(PixmapList::Iterator it = list.begin(); it != list.end(); ++it ) { | 125 | for(PixmapList::Iterator it = list.begin(); it != list.end(); ++it ) { |
124 | owarn << "Got " << (*it).width << " " << (*it).height << " " + (*it).file << oendl; | 126 | owarn << "Got " << (*it).width << " " << (*it).height << " " + (*it).file << oendl; |
125 | m_inPix.append(*it); | 127 | m_inPix.append(*it); |
126 | } | 128 | } |
127 | }else if ( string == "refUp()" ) { | 129 | }else if ( string == "refUp()" ) { |
@@ -210,7 +212,7 @@ void SlaveReciever::slotSend() { | |||
210 | 212 | ||
211 | m_out->stop(); | 213 | m_out->stop(); |
212 | 214 | ||
213 | owarn << "Sending " << outPix().count() << " " << outInf().count() << "" << oendl; | 215 | owarn << "Sending " << outPix().count() << " " << outInf().count() << "" << oendl; |
214 | /* queue it and send */ | 216 | /* queue it and send */ |
215 | /* if this ever gets a service introduce request queues | 217 | /* if this ever gets a service introduce request queues |
216 | * so we can differinatate between different clients | 218 | * so we can differinatate between different clients |
@@ -219,14 +221,14 @@ void SlaveReciever::slotSend() { | |||
219 | QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(PixmapList)" ); | 221 | QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(PixmapList)" ); |
220 | answer << outPix(); | 222 | answer << outPix(); |
221 | for ( PixmapList::Iterator it = m_outPix.begin();it!=m_outPix.end();++it ) { | 223 | for ( PixmapList::Iterator it = m_outPix.begin();it!=m_outPix.end();++it ) { |
222 | owarn << "Sending out " << (*it).file.latin1() << " " << (*it).width << " " << (*it).height << "" << oendl; | 224 | owarn << "Sending out " << (*it).file.latin1() << " " << (*it).width << " " << (*it).height << "" << oendl; |
223 | } | 225 | } |
224 | } | 226 | } |
225 | if ( !m_outList.isEmpty() ) { | 227 | if ( !m_outList.isEmpty() ) { |
226 | QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(StringList)" ); | 228 | QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(StringList)" ); |
227 | answer << outInf(); | 229 | answer << outInf(); |
228 | for ( StringList::Iterator it = m_outList.begin();it!=m_outList.end();++it ) { | 230 | for ( StringList::Iterator it = m_outList.begin();it!=m_outList.end();++it ) { |
229 | owarn << "Sending out2 " + (*it).file << oendl; | 231 | owarn << "Sending out2 " + (*it).file << oendl; |
230 | } | 232 | } |
231 | } | 233 | } |
232 | 234 | ||