Updating apps to use quickexec. Ipks are now generated properly.

4 files changed, 9 insertions, 19 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 0ba024e..438c270 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -268,6 +268,10 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         setCentralWidget(listContainer);
 
         //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
+        connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
+        connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) );
+        connect( qApp, SIGNAL( appMessage(const QCString &, const QByteArray &) ),
+        this, SLOT( appMessage(const QCString &, const QByteArray &) ) );
 
 
         isLoading = false;
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index f7a560a..34bcb2a 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -48,6 +48,7 @@ class AddressbookWindow: public QMainWindow
 public:
         enum EntryMode { NewEntry=0, EditEntry };
 
+        static QString appName() { return QString::fromLatin1("addressbook"); }
         AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
         ~AddressbookWindow();
 
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index c90568a..6a04e22 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -1,7 +1,5 @@
-        TEMPLATE= app
-        #CONFIG         = qt warn_on release
-        CONFIG  = qt warn_on debug
-        DESTDIR         = $(OPIEDIR)/bin
+        #CONFIG         = qt warn_on release quick-app
+        CONFIG  = qt warn_on debug  quick-app
         HEADERS= addressbook.h \
                   contacteditor.h \
                   ablabel.h \
diff --git a/core/pim/addressbook/main.cpp b/core/pim/addressbook/main.cpp
index 2ea1819..97bfa6d 100644
--- a/core/pim/addressbook/main.cpp
+++ b/core/pim/addressbook/main.cpp
@@ -21,21 +21,8 @@
 #include "addressbook.h"
 
 #include <qpe/qpeapplication.h>
-#include <qpe/qcopenvelope_qws.h>
-#include <qstring.h>
 
-int main( int argc, char ** argv )
-{
-    QPEApplication a( argc, argv );
+#include <opie/oapplicationfactory.h>
 
-    AddressbookWindow mw;
-    QObject::connect( &a, SIGNAL( flush() ), &mw, SLOT( flush() ) );
-    QObject::connect( &a, SIGNAL( reload() ), &mw, SLOT( reload() ) );
-    QObject::connect( &a, SIGNAL( appMessage(const QCString &, const QByteArray &) ), 
-            &mw, SLOT( appMessage(const QCString &, const QByteArray &) ) );
+OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> )
 
-    mw.setCaption( AddressbookWindow::tr("Contacts") );
-    a.showMainDocumentWidget(&mw);
-
-    return a.exec();
-}