summaryrefslogtreecommitdiff
authortreke <treke>2003-11-11 07:14:38 (UTC)
committer treke <treke>2003-11-11 07:14:38 (UTC)
commit1eb61020dcba9bafd2926ab701120f5ef94905f7 (patch) (unidiff)
tree10d128bbf5b5b597aaf9602cb372ccbe46c12558
parentf3326a60ba002b420f33b6132dc1740c0fc4ffef (diff)
downloadopie-1eb61020dcba9bafd2926ab701120f5ef94905f7.zip
opie-1eb61020dcba9bafd2926ab701120f5ef94905f7.tar.gz
opie-1eb61020dcba9bafd2926ab701120f5ef94905f7.tar.bz2
Updating apps to use quickexec. Ipks are now generated properly.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.cpp4
-rw-r--r--core/pim/addressbook/addressbook.h1
-rw-r--r--core/pim/addressbook/addressbook.pro6
-rw-r--r--core/pim/addressbook/main.cpp17
-rw-r--r--core/pim/datebook/datebook.h1
-rw-r--r--core/pim/datebook/datebook.pro4
-rw-r--r--core/pim/datebook/main.cpp19
-rw-r--r--core/pim/osearch/main.cpp11
-rw-r--r--core/pim/osearch/osearch.pro17
-rw-r--r--core/pim/today/today.pro18
-rw-r--r--noncore/apps/opie-reader/opie-reader.control2
-rw-r--r--noncore/multimedia/opierec/main.cpp12
-rw-r--r--noncore/multimedia/opierec/opierec.pro4
-rw-r--r--noncore/multimedia/opierec/qtrec.h1
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
@@ -267,8 +267,12 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
267 267
268 setCentralWidget(listContainer); 268 setCentralWidget(listContainer);
269 269
270 // qDebug("adressbook contrsuction: t=%d", t.elapsed() ); 270 // qDebug("adressbook contrsuction: t=%d", t.elapsed() );
271 connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
272 connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) );
273 connect( qApp, SIGNAL( appMessage(const QCString &, const QByteArray &) ),
274 this, SLOT( appMessage(const QCString &, const QByteArray &) ) );
271 275
272 276
273 isLoading = false; 277 isLoading = false;
274} 278}
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
47 Q_OBJECT 47 Q_OBJECT
48public: 48public:
49 enum EntryMode { NewEntry=0, EditEntry }; 49 enum EntryMode { NewEntry=0, EditEntry };
50 50
51 static QString appName() { return QString::fromLatin1("addressbook"); }
51 AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); 52 AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
52 ~AddressbookWindow(); 53 ~AddressbookWindow();
53 54
54protected: 55protected:
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 @@
1 TEMPLATE= app 1 #CONFIG = qt warn_on release quick-app
2 #CONFIG = qt warn_on release 2 CONFIG = qt warn_on debug quick-app
3 CONFIG = qt warn_on debug
4 DESTDIR = $(OPIEDIR)/bin
5 HEADERS= addressbook.h \ 3 HEADERS= addressbook.h \
6 contacteditor.h \ 4 contacteditor.h \
7 ablabel.h \ 5 ablabel.h \
8 abtable.h \ 6 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 @@
20 20
21#include "addressbook.h" 21#include "addressbook.h"
22 22
23#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
24#include <qpe/qcopenvelope_qws.h>
25#include <qstring.h>
26 24
27int main( int argc, char ** argv ) 25#include <opie/oapplicationfactory.h>
28{
29 QPEApplication a( argc, argv );
30 26
31 AddressbookWindow mw; 27OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> )
32 QObject::connect( &a, SIGNAL( flush() ), &mw, SLOT( flush() ) );
33 QObject::connect( &a, SIGNAL( reload() ), &mw, SLOT( reload() ) );
34 QObject::connect( &a, SIGNAL( appMessage(const QCString &, const QByteArray &) ),
35 &mw, SLOT( appMessage(const QCString &, const QByteArray &) ) );
36 28
37 mw.setCaption( AddressbookWindow::tr("Contacts") );
38 a.showMainDocumentWidget(&mw);
39
40 return a.exec();
41}
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
46{ 46{
47 Q_OBJECT 47 Q_OBJECT
48 48
49public: 49public:
50 static QString appName() { return QString::fromLatin1("datebook"); }
50 DateBook( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); 51 DateBook( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
51 ~DateBook(); 52 ~DateBook();
52 53
53signals: 54signals:
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 @@
1 TEMPLATE= app 1 CONFIG += qt warn_on release quick-app
2 CONFIG += qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin
4 HEADERS= datebookday.h \ 2 HEADERS= datebookday.h \
5 datebook.h \ 3 datebook.h \
6 dateentryimpl.h \ 4 dateentryimpl.h \
7 datebookdayheaderimpl.h \ 5 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 @@
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "datebook.h" 21#include "datebook.h"
22#include <qpe/qpeapplication.h> 22#include <qpe/qpeapplication.h>
23 23#include <opie/oapplicationfactory.h>
24 24
25int main( int argc, char **argv ) 25OPIE_EXPORT_APP( OApplicationFactory<DateBook> )
26{
27 QPEApplication a( argc, argv );
28
29 DateBook e;
30 QObject::connect( &a, SIGNAL( flush() ), &e, SLOT( flush() ) );
31 QObject::connect( &a, SIGNAL( reload() ), &e, SLOT( reload() ) );
32
33
34 e.setCaption( DateBook::tr("Calendar") );
35 a.showMainWidget(&e);
36
37 return a.exec();
38}
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 @@
1 1
2#include "mainwindow.h" 2#include "mainwindow.h"
3 3
4#include <qpe/qpeapplication.h> 4#include <qpe/qpeapplication.h>
5#include <opie/oapplicationfactory.h>
5 6
6int main( int argc, char ** argv ) 7OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
7{
8
9 QPEApplication a( argc, argv );
10 MainWindow mw;
11 mw.showMaximized();
12 a.showMainDocumentWidget( &mw );
13 return a.exec();
14}
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 @@
1DEPENDPATH += $(OPIEDIR)/include 1CONFIG += qt release warn_on quick-app
2LIBS += -lqpe -lopie
3INTERFACES =
4include ( $(OPIEDIR)/include.pro )
5TEMPLATE = app
6CONFIG += debug warn_on qt
7DESTDIR = $(OPIEDIR)/bin
8TARGET = osearch
9INCLUDEPATH = $(OPIEDIR)/include
10SOURCES += main.cpp \ 2SOURCES += main.cpp \
11 mainwindow.cpp \ 3 mainwindow.cpp \
12 olistview.cpp \ 4 olistview.cpp \
13 olistviewitem.cpp \ 5 olistviewitem.cpp \
@@ -37,4 +29,11 @@ HEADERS += mainwindow.h \
37 applnksearch.h \ 29 applnksearch.h \
38 applnkitem.h \ 30 applnkitem.h \
39 doclnkitem.h \ 31 doclnkitem.h \
40 doclnksearch.h 32 doclnksearch.h
33
34 TARGET= osearch
35
36INCLUDEPATH = $(OPIEDIR)/include
37DEPENDPATH += $(OPIEDIR)/include
38LIBS += -lqpe -lopie
39include ( $(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 @@
1 CONFIG = qt warn_on 1 CONFIG += qt warn on release quick-app
2 #CONFIG = qt warn_on release
3 2
4 HEADERS = today.h todaybase.h todayconfig.h 3 HEADERS = today.h todaybase.h todayconfig.h
5 SOURCES = today.cpp todaybase.cpp todayconfig.cpp 4 SOURCES = today.cpp todaybase.cpp todayconfig.cpp
6 INCLUDEPATH+= $(OPIEDIR)/include 5 INCLUDEPATH+= $(OPIEDIR)/include
@@ -28,19 +27,4 @@ TRANSLATIONS = ../../../i18n/de/today.ts \
28 ../../../i18n/it/today.ts \ 27 ../../../i18n/it/today.ts \
29 ../../../i18n/da/today.ts 28 ../../../i18n/da/today.ts
30 29
31include ( $(OPIEDIR)/include.pro ) 30include ( $(OPIEDIR)/include.pro )
32
33oapp {
34 TEMPLATE= lib
35 SOURCES += plugin.cpp
36 LIBS += -loapp
37
38 DESTDIR = $(OPIEDIR)/plugins/app
39 INCLUDEPATH+= $(OPIEDIR)/core/apps/oapp
40 DEPENDPATH+= $(OPIEDIR)/core/apps/oapp
41}
42else {
43 TEMPLATE= app
44 SOURCES += main.cpp
45 DESTDIR = $(OPIEDIR)/bin
46}
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 @@
1Package: opie-reader 1Package: opie-reader
2Files: plugins/application/libreader.so* bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/* 2Files: bin/reader bin/reader apps/Applications/opie-reader.desktop pics/opie-reader/*
3Priority: optional 3Priority: optional
4Section: applications 4Section: applications
5Maintainer: Tim Wentford <timwentford@hotmail.com> 5Maintainer: Tim Wentford <timwentford@hotmail.com>
6Architecture: arm 6Architecture: 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 @@
10 * (at your option) any later version. * 10 * (at your option) any later version. *
11 ***************************************************************************/ 11 ***************************************************************************/
12#include "qtrec.h" 12#include "qtrec.h"
13#include <qpe/qpeapplication.h> 13#include <qpe/qpeapplication.h>
14 14#include <opie/oapplicationfactory.h>
15int main(int argc, char* argv[]) { 15
16 QPEApplication a(argc, argv); 16OPIE_EXPORT_APP( OApplicationFactory<QtRec> )
17 QtRec qtrec;
18 a.showMainWidget( &qtrec);
19 return a.exec();
20}
21
22
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 @@
1TEMPLATE = app
2#CONFIG = qt warn_on debug 1#CONFIG = qt warn_on debug
3CONFIG = qt warn_on release 2CONFIG = qt warn_on release quick-app
4HEADERS = adpcm.h pixmaps.h helpwindow.h qtrec.h device.h wavFile.h 3HEADERS = adpcm.h pixmaps.h helpwindow.h qtrec.h device.h wavFile.h
5SOURCES = adpcm.c helpwindow.cpp main.cpp qtrec.cpp device.cpp wavFile.cpp 4SOURCES = adpcm.c helpwindow.cpp main.cpp qtrec.cpp device.cpp wavFile.cpp
6INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
7DEPENDPATH += $(OPIEDIR)/include 6DEPENDPATH += $(OPIEDIR)/include
8LIBS += -lqpe -lstdc++ -lpthread 7LIBS += -lqpe -lstdc++ -lpthread
9INTERFACES = 8INTERFACES =
10TARGET = opierec 9TARGET = opierec
11DESTDIR = $(OPIEDIR)/bin
12#TMAKE_CXXFLAGS += -DQT_QWS_VERCEL_IDR -DQWS -fno-exceptions -fno-rtti 10#TMAKE_CXXFLAGS += -DQT_QWS_VERCEL_IDR -DQWS -fno-exceptions -fno-rtti
13include ( $(OPIEDIR)/include.pro ) 11include ( $(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
55{ 55{
56 Q_OBJECT 56 Q_OBJECT
57 57
58public: 58public:
59 static QString appName() { return QString::fromLatin1("opierec"); }
59 QtRec( QWidget* parent=0, const char* name=0, WFlags fl=0 ); 60 QtRec( QWidget* parent=0, const char* name=0, WFlags fl=0 );
60 ~QtRec(); 61 ~QtRec();
61 QSlider *OutputSlider,*InputSlider; 62 QSlider *OutputSlider,*InputSlider;
62 63