1 files changed, 13 insertions, 9 deletions

diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp
index bbbbb30..82b3d23 100644
--- a/noncore/graphics/opie-eye/slave/slavereciever.cpp
+++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp
@@ -4,11 +4,15 @@
 
 #include "slavereciever.h"
 #include "slaveiface.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qtimer.h>
 
 static SlaveObjects* _slaveObj = 0;
 
@@ -36,9 +40,9 @@ QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
  * GUI sends no QPIxmap!!!
  */
 QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) {
     s >> inf.file >> inf.width >> inf.height;
-    qWarning( "Recieved %s %d %d", inf.file.latin1(), inf.width, inf.height );
+    owarn << "Recieved " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; 
     return s;
 }
 QDataStream &operator<<( QDataStream& s, const ImageInfo& i) {
     return s << i.kind << i.file << i.info;
@@ -81,9 +85,9 @@ SlaveReciever::SlaveReciever( QObject* par)
 SlaveReciever::~SlaveReciever() {
 }
 
 void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar) {
-    qWarning( "String is %s", string.data() );
+    owarn << "String is " << string.data() << "" << oendl; 
     QDataStream stream(ar, IO_ReadOnly );
     QStringList lst;
     static ImageInfo  inf;
     static PixmapInfo pix;
@@ -93,9 +97,9 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
         m_inList.append(inf);
     }else if ( string == "thumbInfos(QStringList)" ) {
         stream >> lst;
         for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
-            qWarning( "Adding thumbinfo for file "+ *it );
+            owarn << "Adding thumbinfo for file "+ *it << oendl; 
             inf.file = (*it);
             m_inList.append(inf);
         }
     }else if ( string == "fullInfo(QString)" ) {
@@ -104,9 +108,9 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
         m_inList.append(inf);
     }else if ( string == "fullInfos(QStringList)" ) {
         stream >> lst;
         for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
-            qWarning( "Adding fullInfo for"+ *it );
+            owarn << "Adding fullInfo for"+ *it << oendl; 
             inf.file = (*it);
             inf.kind = true;
             m_inList.append(inf);
         }
@@ -116,9 +120,9 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
     }else if ( string == "pixmapInfos(PixmapInfos)" ) {
         PixmapList list;
         stream >> list;
         for(PixmapList::Iterator it = list.begin(); it != list.end(); ++it ) {
-            qWarning( "Got %d %d " + (*it).file, (*it).width , (*it).height );
+            owarn << "Got " << (*it).width << " " << (*it).height << " " + (*it).file << oendl; 
             m_inPix.append(*it);
         }
     }else if ( string == "refUp()" ) {
         m_refs++;
@@ -180,9 +184,9 @@ void SlaveReciever::slotThumbNail() {
     for(it = map->begin(); it != map->end(); ++it ) {
         SlaveInterface* iface = it.data();
         if( iface->supports(inf.file ) ) {
             /* pixmap */
-            qWarning( "Asking for thumbNail in size %d %d for "+inf.file, inf.width, inf.height );
+            owarn << "Asking for thumbNail in size " << inf.width << " " << inf.height << " for "+inf.file << oendl; 
             inf.pixmap = iface->pixmap(inf.file, 64, 64);
             m_outPix.append( inf );
             break;
         }
@@ -199,25 +203,25 @@ void SlaveReciever::slotThumbNail() {
 void SlaveReciever::slotSend() {
 
     m_out->stop();
 
-    qWarning( "Sending %d %d", outPix().count(), outInf().count() );
+    owarn << "Sending " << outPix().count() << " " << outInf().count() << "" << oendl; 
     /* queue it and send */
     /* if this ever gets a service introduce request queues
      * so we can differinatate between different clients
      */
     if (! m_outPix.isEmpty() ) {
         QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(PixmapList)" );
         answer << outPix();
         for ( PixmapList::Iterator it = m_outPix.begin();it!=m_outPix.end();++it ) {
-            qWarning( "Sending out %s %d %d", (*it).file.latin1(), (*it).width, (*it).height );
+            owarn << "Sending out " << (*it).file.latin1() << " " << (*it).width << " " << (*it).height << "" << oendl; 
         }
     }
     if ( !m_outList.isEmpty() ) {
         QCopEnvelope answer("QPE/opie-eye", "pixmapsHandled(StringList)" );
         answer << outInf();
         for ( StringList::Iterator it = m_outList.begin();it!=m_outList.end();++it ) {
-            qWarning( "Sending out2 " + (*it).file );
+            owarn << "Sending out2 " + (*it).file << oendl; 
         }
     }
 
     m_outList.clear();