-Removal of debug messages

-Cleanups of .pro files
-Cleanups of source code

And finally the long awaited DigiCam (dcim) Backend

4 files changed, 17 insertions, 12 deletions

diff --git a/noncore/graphics/opie-eye/impl/doc/doc.pro b/noncore/graphics/opie-eye/impl/doc/doc.pro
new file mode 100644
index 0000000..076aa3b
--- a/dev/null
+++ b/noncore/graphics/opie-eye/impl/doc/doc.pro
@@ -0,0 +1,7 @@
+HEADERS  +=  impl/doc/doc_dirview.h     \  
+             impl/doc/doc_ifaceinfo.h   \
+             impl/doc/doc_lister.h 
+            
+SOURCES  +=  impl/doc/doc_dirview.cpp   \
+             impl/doc/doc_ifaceinfo.cpp \
+             impl/doc/doc_lister.cpp
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_ifaceinfo.cpp b/noncore/graphics/opie-eye/impl/doc/doc_ifaceinfo.cpp
index a6d6f3c..356a4b6 100644
--- a/noncore/graphics/opie-eye/impl/doc/doc_ifaceinfo.cpp
+++ b/noncore/graphics/opie-eye/impl/doc/doc_ifaceinfo.cpp
@@ -35,23 +35,23 @@ DocInterfaceInfo::~DocInterfaceInfo() {
 }
 
 QString DocInterfaceInfo::name()const {
     return QString::fromLatin1(QObject::tr("DocView" ));
 }
 
-QWidget* DocInterfaceInfo::configWidget(const Config& cfg) {
+QWidget* DocInterfaceInfo::configWidget(const Config& ) {
 #if 0
     DirImageWidget* wid = new DirImageWidget();
     wid->chkbox->setChecked(  cfg.readBoolEntry("Dir_Check_All_Files", true) );
 
     return wid;
 #endif
     return 0L;
 }
 
 void DocInterfaceInfo::writeConfig( QWidget* , Config& ) {
 #if 0
-    owarn << "Write Config" << oendl; 
+    owarn << "Write Config" << oendl;
     DirImageWidget* wid = static_cast<DirImageWidget*>(_wid);
     cfg.writeEntry("Dir_Check_All_Files", wid->chkbox->isChecked() );
 #endif
 }
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
index d4d1831..722fb95 100644
--- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
+++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
@@ -18,28 +18,29 @@ using namespace Opie::Core;
 #include <qdir.h>
 #include <qfileinfo.h>
 
 Doc_DirLister::Doc_DirLister()
     : PDirLister( "doc_dir_lister" )
 {
+    /* connect the signals */
     SlaveMaster* master = SlaveMaster::self();
     connect( master, SIGNAL(sig_start()), this, SIGNAL(sig_start()) );
-    connect( master, SIGNAL(sig_end()), this, SIGNAL(sig_end()) );
+    connect( master, SIGNAL(sig_end()),   this, SIGNAL(sig_end()) );
     connect( master, SIGNAL(sig_thumbInfo(const QString&, const QString&)),
              this, SLOT(slotThumbInfo(const QString&, const QString&)) );
     connect( master, SIGNAL(sig_fullInfo(const QString&, const QString&)),
              this, SLOT(slotFullInfo(const QString&, const QString&)) );
     connect( master, SIGNAL(sig_thumbNail(const QString&, const QPixmap&)),
              this, SLOT(slotThumbNail(const QString&, const QPixmap&)) );
 
     m_namemap.clear();
     m_filemap.clear();
 }
 
 QString Doc_DirLister::defaultPath()const {
-    return ""; QPEApplication::documentDir();
+    return QString::null;
 }
 
 QString Doc_DirLister::setStartPath(const QString&) {
     static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png");
     if (m_namemap.isEmpty()) {
         DocLnkSet ds;
@@ -75,78 +76,74 @@ QStringList Doc_DirLister::files()const {
 void Doc_DirLister::deleteImage( const QString& )
 {
 }
 
 void Doc_DirLister::thumbNail( const QString& str, int w, int h) {
     if (m_namemap.find(str)==m_namemap.end()) {
-        owarn << "Item " << str << " not found" << oendl;
         return;
     }
     QString fname = m_namemap[str];
     SlaveMaster::self()->thumbNail( fname, w, h );
 }
 
 QImage Doc_DirLister::image( const QString& str, Factor f, int m) {
     if (m_namemap.find(str)==m_namemap.end()) {
-        owarn << "Item " << str << " not found" << oendl;
         return QImage();
     }
     QString fname = m_namemap[str];
     return SlaveMaster::self()->image( fname, f, m );
 }
 
 void Doc_DirLister::imageInfo( const QString& str) {
     if (m_namemap.find(str)==m_namemap.end()) {
-        owarn << "Item " << str << " not found" << oendl;
         return;
     }
     QString fname = m_namemap[str];
     SlaveMaster::self()->thumbInfo( fname );
 }
 
 void Doc_DirLister::fullImageInfo( const QString& str) {
     if (m_namemap.find(str)==m_namemap.end()) {
-        owarn << "Item " << str << " not found" << oendl;
         return;
     }
     QString fname = m_namemap[str];
     SlaveMaster::self()->imageInfo( fname );
 }
 
 void Doc_DirLister::slotFullInfo(const QString&f, const QString&t)
 {
     if (m_filemap.find(f)==m_filemap.end()) {
-        owarn << "Item " << f << " not found" << oendl;
         return;
     }
     QString name = m_filemap[f];
     emit sig_fullInfo(name, t);
 }
 
 void Doc_DirLister::slotThumbInfo(const QString&f, const QString&t)
 {
     if (m_filemap.find(f)==m_filemap.end()) {
-        owarn << "Item " << f << " not found" << oendl;
         return;
     }
     QString name = m_filemap[f];
     emit sig_thumbInfo(name, t);
 }
 
 void Doc_DirLister::slotThumbNail(const QString&f, const QPixmap&p)
 {
     if (m_filemap.find(f)==m_filemap.end()) {
-        owarn << "Item " << f << " not found" << oendl;
         return;
     }
     QString name = m_filemap[f];
     emit sig_thumbNail(name, p);
 }
 
 QString Doc_DirLister::nameToFname(const QString&name)const
 {
     if (m_namemap.find(name)==m_namemap.end()) {
-        owarn << "Item " << name << " not found" << oendl;
         return QString::null;
     }
     return m_namemap[name];
 }
+
+QString Doc_DirLister::dirUp( const QString& p ) const{
+    return p;
+}
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.h b/noncore/graphics/opie-eye/impl/doc/doc_lister.h
index a65b616..5884a35 100644
--- a/noncore/graphics/opie-eye/impl/doc/doc_lister.h
+++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.h
@@ -26,12 +26,13 @@ public:
     void deleteImage( const QString& );
     void thumbNail( const QString&, int, int );
     QImage image( const QString&, Factor, int );
     void imageInfo( const QString& );
     void fullImageInfo( const QString& );
     virtual QString nameToFname(const QString&name)const;
+    QString dirUp( const QString& )const;
 
 private:
     QMap<QString,QString> m_namemap,m_filemap;
 protected slots:
     virtual void slotFullInfo(const QString&, const QString&);
     virtual void slotThumbInfo(const QString&, const QString&);