14 files changed, 31 insertions, 86 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
@@ -270,2 +270,6 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         //    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 &) ) );
 
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
@@ -50,2 +50,3 @@ public:
 
+        static QString appName() { return QString::fromLatin1("addressbook"); }
         AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
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,5 +1,3 @@
-        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 \
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
@@ -23,19 +23,6 @@
 #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();
-}
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index eeb8666..d7cfb33 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -49,2 +49,3 @@ class DateBook : public QMainWindow
 public:
+        static QString appName() { return QString::fromLatin1("datebook"); }
     DateBook( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index ae30c8d..6f2d775 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -1,4 +1,2 @@
-        TEMPLATE= app
-        CONFIG  += qt warn_on release
-        DESTDIR         = $(OPIEDIR)/bin
+        CONFIG  += qt warn_on release quick-app
         HEADERS= datebookday.h \
diff --git a/core/pim/datebook/main.cpp b/core/pim/datebook/main.cpp
index caa5fb6..8004690 100644
--- a/core/pim/datebook/main.cpp
+++ b/core/pim/datebook/main.cpp
@@ -22,17 +22,4 @@
 #include <qpe/qpeapplication.h>
-
-
-int main( int argc, char **argv )
-{
-    QPEApplication a( argc, argv );
-
-    DateBook e;
-    QObject::connect( &a, SIGNAL( flush() ), &e, SLOT( flush() ) );
-    QObject::connect( &a, SIGNAL( reload() ), &e, SLOT( reload() ) );
-
-
-    e.setCaption( DateBook::tr("Calendar") );
-    a.showMainWidget(&e);
-
-    return a.exec();
-}
+#include <opie/oapplicationfactory.h>
+         
+OPIE_EXPORT_APP( OApplicationFactory<DateBook> )
diff --git a/core/pim/osearch/main.cpp b/core/pim/osearch/main.cpp
index 6c18adb..9a03818 100644
--- a/core/pim/osearch/main.cpp
+++ b/core/pim/osearch/main.cpp
@@ -4,11 +4,4 @@
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char ** argv )
-{
-
-  QPEApplication a( argc, argv );
-  MainWindow mw;
-  mw.showMaximized();
-  a.showMainDocumentWidget( &mw );
-  return a.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/core/pim/osearch/osearch.pro b/core/pim/osearch/osearch.pro
index 2e571e3..c988f48 100644
--- a/core/pim/osearch/osearch.pro
+++ b/core/pim/osearch/osearch.pro
@@ -1,10 +1,2 @@
-DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
-INTERFACES =
-include ( $(OPIEDIR)/include.pro )
-TEMPLATE = app
-CONFIG += debug warn_on qt
-DESTDIR = $(OPIEDIR)/bin
-TARGET = osearch
-INCLUDEPATH = $(OPIEDIR)/include
+CONFIG += qt release warn_on quick-app
 SOURCES += main.cpp \
@@ -40 +32,8 @@ HEADERS += mainwindow.h \
            doclnksearch.h 
+
+        TARGET= osearch
+
+INCLUDEPATH = $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
+LIBS += -lqpe -lopie
+include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index 218cab8..26692cc 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -1,3 +1,2 @@
-        CONFIG  = qt warn_on 
-        #CONFIG         = qt warn_on release
+        CONFIG  += qt warn on release quick-app
 
@@ -31,16 +30 @@ TRANSLATIONS = ../../../i18n/de/today.ts \
 include ( $(OPIEDIR)/include.pro )
-
-oapp {
-                TEMPLATE= lib
-                SOURCES         += plugin.cpp
-                LIBS    += -loapp
-
-                DESTDIR         = $(OPIEDIR)/plugins/app
-                INCLUDEPATH+= $(OPIEDIR)/core/apps/oapp
-                DEPENDPATH+= $(OPIEDIR)/core/apps/oapp
-}
-else {
-                TEMPLATE= app
-                SOURCES         += main.cpp
-                DESTDIR         = $(OPIEDIR)/bin
-}
diff --git a/noncore/apps/opie-reader/opie-reader.control b/noncore/apps/opie-reader/opie-reader.control
index eab3ef0..841b040 100644
--- a/noncore/apps/opie-reader/opie-reader.control
+++ b/noncore/apps/opie-reader/opie-reader.control
@@ -1,3 +1,3 @@
 Package: opie-reader
-Files: plugins/application/libreader.so* bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
+Files: bin/reader bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
 Priority: optional
diff --git a/noncore/multimedia/opierec/main.cpp b/noncore/multimedia/opierec/main.cpp
index 5f7c02f..4a94800 100644
--- a/noncore/multimedia/opierec/main.cpp
+++ b/noncore/multimedia/opierec/main.cpp
@@ -13,10 +13,4 @@
 #include <qpe/qpeapplication.h>
-
-int main(int argc, char* argv[]) {
-    QPEApplication a(argc, argv);
-    QtRec qtrec;
-    a.showMainWidget( &qtrec);
- return a.exec();
-}
-
-
+#include <opie/oapplicationfactory.h>
+         
+OPIE_EXPORT_APP( OApplicationFactory<QtRec> )
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 3447f99..aa14864 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -1,4 +1,3 @@
-TEMPLATE  = app
 #CONFIG   = qt warn_on debug
-CONFIG    = qt warn_on release
+CONFIG    = qt warn_on release quick-app
 HEADERS   = adpcm.h pixmaps.h helpwindow.h qtrec.h device.h wavFile.h
@@ -10,3 +9,2 @@ INTERFACES  =
 TARGET    = opierec
-DESTDIR = $(OPIEDIR)/bin
 #TMAKE_CXXFLAGS += -DQT_QWS_VERCEL_IDR -DQWS -fno-exceptions -fno-rtti
diff --git a/noncore/multimedia/opierec/qtrec.h b/noncore/multimedia/opierec/qtrec.h
index 7965c74..5d6ed62 100644
--- a/noncore/multimedia/opierec/qtrec.h
+++ b/noncore/multimedia/opierec/qtrec.h
@@ -58,2 +58,3 @@ class QtRec : public QWidget
 public:
+        static QString appName() { return QString::fromLatin1("opierec"); }
    QtRec( QWidget* parent=0, const char* name=0, WFlags fl=0 );