5 files changed, 20 insertions, 8 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 38a621e..729b64f 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -94,5 +94,5 @@ PIconView::PIconView( QWidget* wid, Config* cfg )
 {
     {
-//        QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" );
+        QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" );
     }
     m_path = QDir::homeDirPath();
@@ -123,4 +123,7 @@ PIconView::PIconView( QWidget* wid, Config* cfg )
 
 PIconView::~PIconView() {
+    {
+        QCopEnvelope( "QPE/Application/opie-eye_slave", "refDown()" );
+    }
 }
 
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 0a2fcab..ea765d1 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -14,6 +14,6 @@
 #include <qpe/ir.h>
 
-#include <opie/oapplicationfactory.h>
-#include <opie/otabwidget.h>
+#include <opie2/oapplicationfactory.h>
+#include <opie2/otabwidget.h>
 
 #include <iface/ifaceinfo.h>
@@ -25,5 +25,5 @@
 #include "mainwindow.h"
 
-OPIE_EXPORT_APP( OApplicationFactory<PMainWindow> )
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow> )
 
 PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
@@ -85,5 +85,5 @@ void PMainWindow::slotConfig() {
 
     QHBoxLayout *lay = new QHBoxLayout(&dlg);
-    OTabWidget *wid = new OTabWidget(&dlg );
+    Opie::Ui::OTabWidget *wid = new Opie::Ui::OTabWidget(&dlg );
     lay->addWidget( wid );
     ViewMap *vM = viewMap();
diff --git a/noncore/graphics/opie-eye/phunk_view.pro b/noncore/graphics/opie-eye/phunk_view.pro
index 21178ee..0bb5679 100644
--- a/noncore/graphics/opie-eye/phunk_view.pro
+++ b/noncore/graphics/opie-eye/phunk_view.pro
@@ -30,5 +30,5 @@ DEPENDPATH  += $(OPIEDIR)/include
 
 
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopieui2
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp
index c8e33d4..bbbbb30 100644
--- a/noncore/graphics/opie-eye/slave/slavereciever.cpp
+++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp
@@ -58,5 +58,5 @@ SlaveObjects* slaveObjects() {
 
 SlaveReciever::SlaveReciever( QObject* par)
-    : QObject( par )
+    : QObject( par ), m_refs( 0 )
 {
     m_inf = new QTimer(this);
@@ -121,4 +121,8 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
             m_inPix.append(*it);
         }
+    }else if ( string == "refUp()" ) {
+        m_refs++;
+    }else if ( string == "refDown()" ) {
+        m_refs--;
     }
 
@@ -129,5 +133,8 @@ void SlaveReciever::recieveAnswer( const QCString& string, const QByteArray& ar)
         m_pix->start(5);
 
-    QPEApplication::setKeepRunning();
+    if ( m_refs )
+        QPEApplication::setKeepRunning();
+    else
+        qApp->quit();
 
 }
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.h b/noncore/graphics/opie-eye/slave/slavereciever.h
index 214bfc6..b5aaccf 100644
--- a/noncore/graphics/opie-eye/slave/slavereciever.h
+++ b/noncore/graphics/opie-eye/slave/slavereciever.h
@@ -53,4 +53,6 @@ private:
     StringList m_inList, m_outList;
     PixmapList m_inPix, m_outPix;
+private:
+    int m_refs;
 };