1 files changed, 21 insertions, 5 deletions

diff --git a/noncore/graphics/opie-eye/lib/slavemaster.cpp b/noncore/graphics/opie-eye/lib/slavemaster.cpp
index 5bb7ab8..d7165cc 100644
--- a/noncore/graphics/opie-eye/lib/slavemaster.cpp
+++ b/noncore/graphics/opie-eye/lib/slavemaster.cpp
@@ -18,25 +18,25 @@ QDataStream & operator << (QDataStream & str, bool b)
 QDataStream & operator >> (QDataStream & str, bool & b)
 {
   Q_INT8 l;
   str >> l;
   b = bool(l);
   return str;
 }
 
 /*
  * ! We don't put a Pixmap in!!!!
  */
 QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
-    owarn << "Image request is " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl; 
+    owarn << "Image request is " << inf.file.latin1() << " " << inf.width << " " << inf.height << "" << oendl;
     return s << inf.file  << inf.width << inf.height;
 }
 QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) {
     s >> inf.file >> inf.pixmap >> inf.width >> inf.height;
     return s;
 }
 QDataStream &operator<<( QDataStream& s, const ImageInfo& i) {
     return s << i.kind << i.file << i.info;
 }
 QDataStream &operator>>( QDataStream& s, ImageInfo& i ) {
     s >> i.kind >> i.file >> i.info;
     return s;
@@ -73,52 +73,52 @@ void SlaveMaster::thumbInfo( const QString& str) {
 }
 
 void SlaveMaster::imageInfo( const QString& str ) {
     m_inImageInfo.append( str );
     if ( !m_started ) {
         QTimer::singleShot( 0, this, SLOT(slotTimerStart()));
         m_started = true;
     }
 }
 
 void SlaveMaster::thumbNail( const QString& str, int w, int h ) {
     if ( str.isEmpty() ) {
-        owarn << "Asking for empty nail" << oendl; 
+        owarn << "Asking for empty nail" << oendl;
         return;
     }
-    owarn << "Asking for thumbNail in size " << w << " " << h << "" + str << oendl; 
+    owarn << "Asking for thumbNail in size " << w << " " << h << "" + str << oendl;
     PixmapInfo item;
     item.file = str; item.width = w; item.height = h;
     item.pixmap = QPixmap();
     m_inThumbNail.append( item );
 
     if ( !m_started ) {
         QTimer::singleShot( 0, this, SLOT(slotTimerStart()));
         m_started = true;
     }
 }
 
 
 void SlaveMaster::recieve( const QCString& str, const QByteArray& at) {
 
     ImageInfos infos;
     PixmapInfos pixinfos;
 
     QDataStream stream( at, IO_ReadOnly );
     if ( str == "pixmapsHandled(PixmapList)" )
         stream >> pixinfos;
     else if ( str == "pixmapsHandled(StringList)" )
         stream >> infos;
 
-    owarn << "PixInfos " << pixinfos.count() << "" << oendl; 
+    owarn << "PixInfos " << pixinfos.count() << "" << oendl;
 
     bool got_data = ( !infos.isEmpty() || !pixinfos.isEmpty() );
     if ( got_data ) {
         emit sig_start();
         for ( ImageInfos::Iterator _it = infos.begin(); _it != infos.end(); ++_it ) {
             if (  (*_it).kind )
                 emit  sig_fullInfo( (*_it).file, (*_it).info );
             else
                 emit sig_thumbInfo( (*_it).file, (*_it).info );
         }
 
         for ( PixmapInfos::Iterator it = pixinfos.begin(); it != pixinfos.end(); ++it )
@@ -140,15 +140,31 @@ void SlaveMaster::slotTimerStart() {
     }
     if ( !m_inThumbNail.isEmpty() ) {
         QCopEnvelope env("QPE/opie-eye_slave", "pixmapInfos(PixmapInfos)" );
         env << m_inThumbNail;
     }
 
 
     m_inThumbInfo.clear();
     m_inImageInfo.clear();
     m_inThumbNail.clear();
 }
 
-QImage SlaveMaster::image( const QString& str, PDirLister::Factor, int ) {
+QImage SlaveMaster::image( const QString& , PDirLister::Factor, int ) {
     return QImage();
 }
+
+
+namespace SlaveHelper {
+void slaveConnectSignals( QObject* target ) {
+    SlaveMaster* master = SlaveMaster::self();
+
+    QObject::connect( master, SIGNAL(sig_start()), target, SIGNAL(sig_start()) );
+    QObject::connect( master, SIGNAL(sig_end()), target, SIGNAL(sig_end()) );
+    QObject::connect( master, SIGNAL(sig_thumbInfo(const QString&, const QString&)),
+                      target, SIGNAL(sig_thumbInfo(const QString&, const QString&)) );
+    QObject::connect( master, SIGNAL(sig_fullInfo(const QString&, const QString&)),
+                      target, SIGNAL(sig_fullInfo(const QString&, const QString&)) );
+    QObject::connect( master, SIGNAL(sig_thumbNail(const QString&, const QPixmap&)),
+                      target, SIGNAL(sig_thumbNail(const QString&, const QPixmap&)) );
+}
+}