merge noncore/mail/*

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,14 +1,13 @@
-        TEMPLATE        = app
-        CONFIG          += qt warn_on debug
+        CONFIG          += qt warn_on debug quick-app
         #CONFIG                 += qt warn_on release
         HEADERS                 = accounteditor.h \
                           addresspicker.h \
                           composer.h \
                           composerbase.h \
                           configdiag.h \
                           folderwidget.h \
                           listviewplus.h \
                         mailstatusbar.h \
                           mailtable.h \
                           mainwindow.h \
                           mainwindowbase.h \
@@ -34,25 +33,24 @@ SOURCES		= 	accounteditor.cpp \
                           searchdiag.cpp \
                           viewmail.cpp \
                           viewmailbase.cpp
         INTERFACES      = accounteditorbase.ui \
                           addresspickerbase.ui \
                           configdiagbase.ui \
                           opendiagbase.ui \
                           renamebase.ui \
                           searchdiagbase.ui
         INCLUDEPATH    += $(OPIEDIR)/include libmail
         LIBS           += -lmail -lqpe -lopie
         TARGET          = mail 
-        DESTDIR                 = $(OPIEDIR)/bin
 
 TRANSLATIONS = ../../i18n/de/mail.ts \
          ../../i18n/nl/mail.ts \
          ../../i18n/da/mail.ts \
          ../../i18n/xx/mail.ts \
          ../../i18n/en/mail.ts \
          ../../i18n/es/mail.ts \
          ../../i18n/fr/mail.ts \
          ../../i18n/hu/mail.ts \
          ../../i18n/ja/mail.ts \
          ../../i18n/ko/mail.ts \
          ../../i18n/no/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 @@
 #include <qpe/qpeapplication.h>
 
 #include "mainwindow.h"
 
-int main(int argc, char *argv[])
-{
-        QPEApplication app(argc, argv);
+#include <opie/oapplicationfactory.h>
 
-        MainWindow mw;
-        app.showMainWidget(&mw);
+OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
 
-        return app.exec();
-}
 
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
@@ -4,24 +4,25 @@
 #include "mainwindowbase.h"
 
 #include <qstring.h> 
 
 class IMAPHandler;
 class IMAPResponseFETCH;
 
 class MainWindow : public MainWindowBase
 {
         Q_OBJECT
 
 public:
+        static QString appName() { return QString::fromLatin1("mail"); }
         MainWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 
 protected slots:
         void slotCompose( const QString& name, const QString& email );
         void slotComposeNoParams();
          void slotSendQueued();
         void slotSearch();
         void slotConfigure();
         void mailClicked(IMAPResponseFETCH mail, IMAPHandler *handler);
         void appMessage(const QCString &msg, const QByteArray &data);
 
 };