10 files changed, 68 insertions, 45 deletions

diff --git a/noncore/graphics/opie-eye/config.in b/noncore/graphics/opie-eye/config.in
index 996dcf3..d7f9963 100644
--- a/noncore/graphics/opie-eye/config.in
+++ b/noncore/graphics/opie-eye/config.in
@@ -2,8 +2,8 @@
     boolean "opie-eye The Image Viewer and Browser"
     default "y"
-    depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI
+    depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
     
   config OPIE_EYE_SLAVE
     boolean
     default "y" if OPIE_EYE
-    depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI
+    depends on ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp b/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp
index 79f4510..5599ad1 100644
--- a/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp
+++ b/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp
@@ -4,4 +4,12 @@
  */
 
+#include "dir_ifaceinfo.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qwidget.h>
 #include <qcheckbox.h>
@@ -9,8 +17,4 @@
 #include <qlabel.h>
 
-#include <qpe/config.h>
-
-#include "dir_ifaceinfo.h"
-
 namespace {
     class DirImageWidget : public QHBox {
@@ -42,5 +46,5 @@ QWidget* DirInterfaceInfo::configWidget(const Config& cfg) {
 
 void DirInterfaceInfo::writeConfig( QWidget* _wid, Config& cfg) {
-    qWarning( "Write Config" );
+    owarn << "Write Config" << oendl; 
     DirImageWidget* wid = static_cast<DirImageWidget*>(_wid);
     cfg.writeEntry("Dir_Check_All_Files", wid->chkbox->isChecked() );
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp b/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp
index ffea29e..0a5cff4 100644
--- a/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp
+++ b/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp
@@ -7,17 +7,19 @@
 #include <lib/slavemaster.h>
 
-
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qdir.h>
 #include <qfileinfo.h>
 
-
 Dir_DirLister::Dir_DirLister( bool list )
     : PDirLister( "dir_dir_lister" )
 {
     m_allFiles = list;
-    qWarning("All Files %d", m_allFiles );
+    owarn << "All Files " << m_allFiles << "" << oendl; 
 
     SlaveMaster* master = SlaveMaster::self();
diff --git a/noncore/graphics/opie-eye/lib/slavemaster.cpp b/noncore/graphics/opie-eye/lib/slavemaster.cpp
index 4e28535..5bb7ab8 100644
--- a/noncore/graphics/opie-eye/lib/slavemaster.cpp
+++ b/noncore/graphics/opie-eye/lib/slavemaster.cpp
@@ -1,7 +1,11 @@
 #include "slavemaster.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qcopchannel_qws.h>
 #include <qtimer.h>
@@ -24,5 +28,5 @@ QDataStream & operator >> (QDataStream & str, bool & b)
  */
 QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
-    qWarning( "Image request is %s %d %d", inf.file.latin1(), inf.width, inf.height );
+    owarn << "Image request is " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; 
     return s << inf.file  << inf.width << inf.height;
 }
@@ -79,8 +83,8 @@ void SlaveMaster::imageInfo( const QString& str ) {
 void SlaveMaster::thumbNail( const QString& str, int w, int h ) {
     if ( str.isEmpty() ) {
-        qWarning( "Asking for empty nail" );
+        owarn << "Asking for empty nail" << oendl; 
         return;
     }
-    qWarning( "Asking for thumbNail in size %d %d" + str, w,h );
+    owarn << "Asking for thumbNail in size " << w << " " << h << "" + str << oendl; 
     PixmapInfo item;
     item.file = str; item.width = w; item.height = h;
@@ -106,5 +110,5 @@ void SlaveMaster::recieve( const QCString& str, const QByteArray& at) {
         stream >> infos;
 
-    qWarning( "PixInfos %d", pixinfos.count() );
+    owarn << "PixInfos " << pixinfos.count() << "" << oendl; 
 
     bool got_data = ( !infos.isEmpty() || !pixinfos.isEmpty() );
diff --git a/noncore/graphics/opie-eye/phunk_view.pro b/noncore/graphics/opie-eye/phunk_view.pro
index 17fa22c..0e2202a 100644
--- a/noncore/graphics/opie-eye/phunk_view.pro
+++ b/noncore/graphics/opie-eye/phunk_view.pro
@@ -32,5 +32,5 @@ DEPENDPATH  += $(OPIEDIR)/include
 
 
-LIBS += -lqpe -lopieui2
+LIBS += -lqpe -lopiecore2 -lopieui2
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp
index 086b47f..fb7d5de 100644
--- a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp
+++ b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp
@@ -1,9 +1,13 @@
 #include  "jpeg_slave.h"
-
 #include "thumbnailtool.h"
 
 PHUNK_VIEW_INTERFACE( "JPEG", JpegSlave )
 
-#include <qtopia/timestring.h>
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/timestring.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qobject.h>
 #include <qimage.h>
@@ -120,5 +124,5 @@ class FatalError {
 public:
     FatalError(const char* s) { ex = s; }
-    void debug_print() const { qWarning("exception: %s", ex ); }
+    void debug_print() const { owarn << "exception: " << ex << "" << oendl;  }
 };
 
@@ -263,5 +267,5 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode)
             if (a >= 6){
 
-                qWarning( "too many padding bytes" );
+                owarn << "too many padding bytes" << oendl; 
                 return false;
 
@@ -328,5 +332,5 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode)
 
             case M_EOI:   // in case it's a tables-only JPEG stream
-                qWarning( "No image in jpeg!" );
+                owarn << "No image in jpeg!" << oendl; 
                 return false;
 
@@ -727,5 +731,5 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
                         // As Jhead produces this form of format incorrectness,
                         // I'll just let it pass silently
-                        qWarning( "Thumbnail removed with Jhead 1.3 or earlier" );
+                        owarn << "Thumbnail removed with Jhead 1.3 or earlier" << oendl; 
                     }else{
                         return;
@@ -914,5 +918,5 @@ bool ExifData::scan(const QString & path)
 
     if (ret == false){
-        qWarning(  "Not JPEG file!" );
+        owarn << "Not JPEG file!" << oendl; 
         DiscardData();
         f.close();
diff --git a/noncore/graphics/opie-eye/slave/main.cpp b/noncore/graphics/opie-eye/slave/main.cpp
index 37020e6..5b90483 100644
--- a/noncore/graphics/opie-eye/slave/main.cpp
+++ b/noncore/graphics/opie-eye/slave/main.cpp
@@ -32,24 +32,24 @@ int main( int argc, char* argv[] ) {
     QApplication app( argc, argv );
     GifSlave slave;
-    qWarning( str +" "+slave.iconViewName(str ) );
-    qWarning( str+" "+slave.fullImageInfo( str ) );
+    owarn << str +" "+slave.iconViewName(str ) << oendl; 
+    owarn << str+" "+slave.fullImageInfo( str ) << oendl; 
 
     PNGSlave pngslave;
-    qWarning( str + " " + pngslave.iconViewName(str) );
-    qWarning( str + " " + pngslave.fullImageInfo(str));
+    owarn << str + " " + pngslave.iconViewName(str) << oendl; 
+    owarn << str + " " + pngslave.fullImageInfo(str) << oendl; 
 
 
     JpegSlave jpgslave;
-    qWarning( str + " " + jpgslave.iconViewName(str ) );
-    qWarning( str + " " + jpgslave.fullImageInfo( str ) );
+    owarn << str + " " + jpgslave.iconViewName(str ) << oendl; 
+    owarn << str + " " + jpgslave.fullImageInfo( str ) << oendl; 
 //return app.exec();
     QPixmap pix = ThumbNailTool::getThumb( str, 24, 24 );
     if ( pix.isNull() ) {
-        qWarning( "No Thumbnail" );
+        owarn << "No Thumbnail" << oendl; 
         pix = slave.pixmap(str, 24, 24);
     }
 
     if (!pix.isNull() ) {
-        qWarning( "Saving Thumbnail" );
+        owarn << "Saving Thumbnail" << oendl; 
         ThumbNailTool::putThumb( str, pix, 24, 24 );
     }
diff --git a/noncore/graphics/opie-eye/slave/slave.pro b/noncore/graphics/opie-eye/slave/slave.pro
index 3f42495..903d667 100644
--- a/noncore/graphics/opie-eye/slave/slave.pro
+++ b/noncore/graphics/opie-eye/slave/slave.pro
@@ -1,3 +1,3 @@
-CONFIG += qte
+CONFIG = qt
 TEMPLATE = app
 TARGET = opie-eye_slave
@@ -14,5 +14,5 @@ INCLUDEPATH += $(OPIEDIR)/include ../
 DEPENDSPATH += $(OPIEDIR)/include
 
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
 
-include ( $(OPIEDIR)/include.pro )
\ No newline at end of file
+include ( $(OPIEDIR)/include.pro )
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
@@ -6,7 +6,11 @@
 #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>
 
@@ -38,5 +42,5 @@ QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
 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;
 }
@@ -83,5 +87,5 @@ 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;
@@ -95,5 +99,5 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
         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);
@@ -106,5 +110,5 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
         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;
@@ -118,5 +122,5 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
         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);
         }
@@ -182,5 +186,5 @@ void SlaveReciever::slotThumbNail() {
         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 );
@@ -201,5 +205,5 @@ 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
@@ -210,5 +214,5 @@ void SlaveReciever::slotSend() {
         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; 
         }
     }
@@ -217,5 +221,5 @@ void SlaveReciever::slotSend() {
         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; 
         }
     }
diff --git a/noncore/graphics/opie-eye/slave/thumbnailtool.cpp b/noncore/graphics/opie-eye/slave/thumbnailtool.cpp
index a202457..d2e169c 100644
--- a/noncore/graphics/opie-eye/slave/thumbnailtool.cpp
+++ b/noncore/graphics/opie-eye/slave/thumbnailtool.cpp
@@ -1,4 +1,9 @@
 #include "thumbnailtool.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qfileinfo.h>
 #include <qdir.h>
@@ -27,5 +32,5 @@ static bool makeThumbDir( const QFileInfo& inf,  bool make = false) {
 QPixmap ThumbNailTool::getThumb( const QString& path, int width, int height ) {
     QFileInfo inf( path );
-    qWarning( "Get Thumb" );
+    owarn << "Get Thumb" << oendl; 
     if ( !makeThumbDir( inf ) ) {
         QPixmap pix;
@@ -33,5 +38,5 @@ QPixmap ThumbNailTool::getThumb( const QString& path, int width, int height ) {
     }
     QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() );
-    qWarning( inf.dirPath()+str );
+    owarn << inf.dirPath()+str << oendl; 
     return QPixmap( inf.dirPath()+str,"PNG" );
 
@@ -42,5 +47,5 @@ void ThumbNailTool::putThumb( const QString& path, const QPixmap& pix, int width
     makeThumbDir( inf, true );
     QString str = QString( "/.opie-eye/%1x%2-%3" ).arg( width ).arg( height ).arg( inf.fileName() );
-    qWarning( inf.dirPath()+str );
+    owarn << inf.dirPath()+str << oendl; 
     pix.save( inf.dirPath()+str, "PNG" );
 }