author | mickeyl <mickeyl> | 2003-10-27 20:20:24 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-27 20:20:24 (UTC) |
commit | 651d29249946e7221fc85580453750d9e4be4fb0 (patch) (unidiff) | |
tree | c42b13795bee233df19233245257bedf9a7afe10 /noncore/unsupported/mail2 | |
parent | b367c7a9a97082419832c62d879c1ed2c80b8249 (diff) | |
download | opie-651d29249946e7221fc85580453750d9e4be4fb0.zip opie-651d29249946e7221fc85580453750d9e4be4fb0.tar.gz opie-651d29249946e7221fc85580453750d9e4be4fb0.tar.bz2 |
merge noncore/mail/*
-rw-r--r-- | noncore/unsupported/mail2/mail.pro | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/main.cpp | 9 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindow.h | 1 |
3 files changed, 4 insertions, 10 deletions
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro index 0c1a1fb..f521178 100644 --- a/noncore/unsupported/mail2/mail.pro +++ b/noncore/unsupported/mail2/mail.pro | |||
@@ -1,8 +1,7 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on debug quick-app |
2 | CONFIG += qt warn_on debug | ||
3 | #CONFIG += qt warn_on release | 2 | #CONFIG += qt warn_on release |
4 | HEADERS = accounteditor.h \ | 3 | HEADERS = accounteditor.h \ |
5 | addresspicker.h \ | 4 | addresspicker.h \ |
6 | composer.h \ | 5 | composer.h \ |
7 | composerbase.h \ | 6 | composerbase.h \ |
8 | configdiag.h \ | 7 | configdiag.h \ |
@@ -40,13 +39,12 @@ INTERFACES = accounteditorbase.ui \ | |||
40 | opendiagbase.ui \ | 39 | opendiagbase.ui \ |
41 | renamebase.ui \ | 40 | renamebase.ui \ |
42 | searchdiagbase.ui | 41 | searchdiagbase.ui |
43 | INCLUDEPATH += $(OPIEDIR)/include libmail | 42 | INCLUDEPATH += $(OPIEDIR)/include libmail |
44 | LIBS += -lmail -lqpe -lopie | 43 | LIBS += -lmail -lqpe -lopie |
45 | TARGET = mail | 44 | TARGET = mail |
46 | DESTDIR = $(OPIEDIR)/bin | ||
47 | 45 | ||
48 | TRANSLATIONS = ../../i18n/de/mail.ts \ | 46 | TRANSLATIONS = ../../i18n/de/mail.ts \ |
49 | ../../i18n/nl/mail.ts \ | 47 | ../../i18n/nl/mail.ts \ |
50 | ../../i18n/da/mail.ts \ | 48 | ../../i18n/da/mail.ts \ |
51 | ../../i18n/xx/mail.ts \ | 49 | ../../i18n/xx/mail.ts \ |
52 | ../../i18n/en/mail.ts \ | 50 | ../../i18n/en/mail.ts \ |
diff --git a/noncore/unsupported/mail2/main.cpp b/noncore/unsupported/mail2/main.cpp index ddacf3d..a11b4e2 100644 --- a/noncore/unsupported/mail2/main.cpp +++ b/noncore/unsupported/mail2/main.cpp | |||
@@ -1,14 +1,9 @@ | |||
1 | #include <qpe/qpeapplication.h> | 1 | #include <qpe/qpeapplication.h> |
2 | 2 | ||
3 | #include "mainwindow.h" | 3 | #include "mainwindow.h" |
4 | 4 | ||
5 | int main(int argc, char *argv[]) | 5 | #include <opie/oapplicationfactory.h> |
6 | { | ||
7 | QPEApplication app(argc, argv); | ||
8 | 6 | ||
9 | MainWindow mw; | 7 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
10 | app.showMainWidget(&mw); | ||
11 | 8 | ||
12 | return app.exec(); | ||
13 | } | ||
14 | 9 | ||
diff --git a/noncore/unsupported/mail2/mainwindow.h b/noncore/unsupported/mail2/mainwindow.h index 1ed0559..4cdd03d 100644 --- a/noncore/unsupported/mail2/mainwindow.h +++ b/noncore/unsupported/mail2/mainwindow.h | |||
@@ -10,12 +10,13 @@ class IMAPResponseFETCH; | |||
10 | 10 | ||
11 | class MainWindow : public MainWindowBase | 11 | class MainWindow : public MainWindowBase |
12 | { | 12 | { |
13 | Q_OBJECT | 13 | Q_OBJECT |
14 | 14 | ||
15 | public: | 15 | public: |
16 | static QString appName() { return QString::fromLatin1("mail"); } | ||
16 | MainWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); | 17 | MainWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); |
17 | 18 | ||
18 | protected slots: | 19 | protected slots: |
19 | void slotCompose( const QString& name, const QString& email ); | 20 | void slotCompose( const QString& name, const QString& email ); |
20 | void slotComposeNoParams(); | 21 | void slotComposeNoParams(); |
21 | void slotSendQueued(); | 22 | void slotSendQueued(); |