-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 4 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.h | 1 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.pro | 6 | ||||
-rw-r--r-- | core/pim/addressbook/main.cpp | 17 | ||||
-rw-r--r-- | core/pim/datebook/datebook.h | 1 | ||||
-rw-r--r-- | core/pim/datebook/datebook.pro | 4 | ||||
-rw-r--r-- | core/pim/datebook/main.cpp | 17 | ||||
-rw-r--r-- | core/pim/osearch/main.cpp | 11 | ||||
-rw-r--r-- | core/pim/osearch/osearch.pro | 17 | ||||
-rw-r--r-- | core/pim/today/today.pro | 18 | ||||
-rw-r--r-- | noncore/apps/opie-reader/opie-reader.control | 2 | ||||
-rw-r--r-- | noncore/multimedia/opierec/main.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opierec/opierec.pro | 4 | ||||
-rw-r--r-- | noncore/multimedia/opierec/qtrec.h | 1 |
14 files changed, 29 insertions, 84 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 @@ -267,8 +267,12 @@ 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 @@ -47,8 +47,9 @@ class AddressbookWindow: public QMainWindow Q_OBJECT 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(); protected: 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,8 +1,6 @@ -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 \ abtable.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 @@ -20,22 +20,9 @@ #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(); -} 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 @@ -46,8 +46,9 @@ class DateBook : public QMainWindow { Q_OBJECT public: + static QString appName() { return QString::fromLatin1("datebook"); } DateBook( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~DateBook(); signals: 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,7 +1,5 @@ -TEMPLATE = app -CONFIG += qt warn_on release -DESTDIR = $(OPIEDIR)/bin +CONFIG += qt warn_on release quick-app HEADERS = datebookday.h \ datebook.h \ dateentryimpl.h \ datebookdayheaderimpl.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 @@ -19,20 +19,7 @@ **********************************************************************/ #include "datebook.h" #include <qpe/qpeapplication.h> +#include <opie/oapplicationfactory.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(); -} +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 @@ -1,14 +1,7 @@ #include "mainwindow.h" #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,13 +1,5 @@ -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 \ mainwindow.cpp \ olistview.cpp \ olistviewitem.cpp \ @@ -37,4 +29,11 @@ HEADERS += mainwindow.h \ applnksearch.h \ applnkitem.h \ doclnkitem.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,6 +1,5 @@ -CONFIG = qt warn_on -#CONFIG = qt warn_on release +CONFIG += qt warn on release quick-app HEADERS = today.h todaybase.h todayconfig.h SOURCES = today.cpp todaybase.cpp todayconfig.cpp INCLUDEPATH += $(OPIEDIR)/include @@ -28,19 +27,4 @@ TRANSLATIONS = ../../../i18n/de/today.ts \ ../../../i18n/it/today.ts \ ../../../i18n/da/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,6 +1,6 @@ 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 Section: applications Maintainer: Tim Wentford <timwentford@hotmail.com> Architecture: arm 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 @@ -10,13 +10,7 @@ * (at your option) any later version. * ***************************************************************************/ #include "qtrec.h" #include <qpe/qpeapplication.h> +#include <opie/oapplicationfactory.h> -int main(int argc, char* argv[]) { - QPEApplication a(argc, argv); - QtRec qtrec; - a.showMainWidget( &qtrec); - return a.exec(); -} - - +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,13 +1,11 @@ -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 SOURCES = adpcm.c helpwindow.cpp main.cpp qtrec.cpp device.cpp wavFile.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lstdc++ -lpthread INTERFACES = TARGET = opierec -DESTDIR = $(OPIEDIR)/bin #TMAKE_CXXFLAGS += -DQT_QWS_VERCEL_IDR -DQWS -fno-exceptions -fno-rtti include ( $(OPIEDIR)/include.pro ) 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 @@ -55,8 +55,9 @@ class QtRec : public QWidget { Q_OBJECT public: + static QString appName() { return QString::fromLatin1("opierec"); } QtRec( QWidget* parent=0, const char* name=0, WFlags fl=0 ); ~QtRec(); QSlider *OutputSlider,*InputSlider; |