-rw-r--r-- | noncore/net/mail/composemail.cpp | 4 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/libmailwrapper.control | 4 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mhwrapper.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/mail.pro | 4 | ||||
-rw-r--r-- | noncore/net/mail/main.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/opie-mail.control | 4 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.cpp | 4 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/opie-mailapplet.control | 4 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/taskbarapplet.pro | 2 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 4 |
10 files changed, 17 insertions, 17 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index abcc3f6..6708779 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | #include <qt.h> | 1 | #include <qt.h> |
2 | 2 | ||
3 | #include <opie/ofiledialog.h> | 3 | #include <opie2/ofiledialog.h> |
4 | #include <qpe/resource.h> | 4 | #include <qpe/resource.h> |
5 | #include <qpe/config.h> | 5 | #include <qpe/config.h> |
6 | #include <qpe/global.h> | 6 | #include <qpe/global.h> |
7 | #include <qpe/contact.h> | 7 | #include <qpe/contact.h> |
@@ -162,9 +162,9 @@ void ComposeMail::slotAdjustColumns() | |||
162 | } | 162 | } |
163 | 163 | ||
164 | void ComposeMail::addAttachment() | 164 | void ComposeMail::addAttachment() |
165 | { | 165 | { |
166 | DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" ); | 166 | DocLnk lnk = Opie::OFileDialog::getOpenFileName( 1, "/" ); |
167 | if ( !lnk.name().isEmpty() ) { | 167 | if ( !lnk.name().isEmpty() ) { |
168 | Attachment *att = new Attachment( lnk ); | 168 | Attachment *att = new Attachment( lnk ); |
169 | (void) new AttachViewItem( attList, att ); | 169 | (void) new AttachViewItem( attList, att ); |
170 | } | 170 | } |
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.control b/noncore/net/mail/libmailwrapper/libmailwrapper.control index 0e9e3ed..8b319c8 100644 --- a/noncore/net/mail/libmailwrapper/libmailwrapper.control +++ b/noncore/net/mail/libmailwrapper/libmailwrapper.control | |||
@@ -3,8 +3,8 @@ Files: lib/libmailwrapper.so* | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: libs | 4 | Section: libs |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 0.4-$SUB_VERSION | 7 | Version: 0.5-$SUB_VERSION |
8 | Depends: task-opie-minimal, libopie1, libetpan | 8 | Depends: task-opie-minimal, libopiecore2, libopieui2, libetpan (>= 0.33pre) |
9 | Description: wrapper lib needed by Opie's mailer | 9 | Description: wrapper lib needed by Opie's mailer |
10 | License: LGPL | 10 | License: LGPL |
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp index 5090f4a..dfc00d8 100644 --- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp | |||
@@ -5,9 +5,9 @@ | |||
5 | #include <qdir.h> | 5 | #include <qdir.h> |
6 | #include <qmessagebox.h> | 6 | #include <qmessagebox.h> |
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #include <qpe/global.h> | 8 | #include <qpe/global.h> |
9 | #include <opie/oprocess.h> | 9 | #include <opie2/oprocess.h> |
10 | 10 | ||
11 | const QString MHwrapper::wrapperType="MH"; | 11 | const QString MHwrapper::wrapperType="MH"; |
12 | 12 | ||
13 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) | 13 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) |
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro index 184b5b3..d3d2ab1 100644 --- a/noncore/net/mail/mail.pro +++ b/noncore/net/mail/mail.pro | |||
@@ -50,11 +50,11 @@ INTERFACES = editaccountsui.ui \ | |||
50 | INCLUDEPATH += $(OPIEDIR)/include | 50 | INCLUDEPATH += $(OPIEDIR)/include |
51 | 51 | ||
52 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 52 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
53 | contains( CONFTEST, y ){ | 53 | contains( CONFTEST, y ){ |
54 | LIBS += -lqpe -lopie -lmailwrapper -liconv | 54 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopie -lmailwrapper -liconv |
55 | }else{ | 55 | }else{ |
56 | LIBS += -lqpe -lopie -lmailwrapper | 56 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopie -lmailwrapper |
57 | } | 57 | } |
58 | 58 | ||
59 | TARGET = opiemail | 59 | TARGET = opiemail |
60 | 60 | ||
diff --git a/noncore/net/mail/main.cpp b/noncore/net/mail/main.cpp index 3bfcb4a..54ac7fb 100644 --- a/noncore/net/mail/main.cpp +++ b/noncore/net/mail/main.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | #include <opie/oapplicationfactory.h> | 1 | #include <opie2/oapplicationfactory.h> |
2 | 2 | ||
3 | #include "opiemail.h" | 3 | #include "opiemail.h" |
4 | 4 | ||
5 | OPIE_EXPORT_APP( OApplicationFactory<OpieMail> ) | 5 | OPIE_EXPORT_APP( OApplicationFactory<OpieMail> ) |
diff --git a/noncore/net/mail/opie-mail.control b/noncore/net/mail/opie-mail.control index 0e11c4a..5f25414 100644 --- a/noncore/net/mail/opie-mail.control +++ b/noncore/net/mail/opie-mail.control | |||
@@ -3,8 +3,8 @@ Files: plugins/application/libopiemail.so* bin/opiemail apps/1Pim/mail.desktop p | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/pim | 4 | Section: opie/pim |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 0.4-$SUB_VERSION | 7 | Version: 0.5-$SUB_VERSION |
8 | Depends: task-opie-minimal, libopie1, libmailwrapper | 8 | Depends: task-opie-minimal, libopie1, libopiecore2, libopieui2, libmailwrapper (>= 0.4) |
9 | Description: Opie's mail and news client (POP3, IMAP and NNTP) | 9 | Description: Opie's mail and news client (POP3, IMAP and NNTP) |
10 | License: LGPL | 10 | License: LGPL |
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp index a0805ba..de32007 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.cpp +++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp | |||
@@ -5,9 +5,9 @@ | |||
5 | #include <qpe/resource.h> | 5 | #include <qpe/resource.h> |
6 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
7 | #include <qpe/applnk.h> | 7 | #include <qpe/applnk.h> |
8 | 8 | ||
9 | #include <opie/odevice.h> | 9 | #include <opie2/odevice.h> |
10 | 10 | ||
11 | #include <libmailwrapper/settings.h> | 11 | #include <libmailwrapper/settings.h> |
12 | 12 | ||
13 | #include "mailapplet.h" | 13 | #include "mailapplet.h" |
@@ -115,9 +115,9 @@ void MailApplet::slotCheck() { | |||
115 | device->setLedState( led, device->ledStateList( led ).contains( Led_BlinkSlow ) ? Led_BlinkSlow : Led_On ); | 115 | device->setLedState( led, device->ledStateList( led ).contains( Led_BlinkSlow ) ? Led_BlinkSlow : Led_On ); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | if ( m_config->readBoolEntry( "PlaySound", false ) ) | 118 | if ( m_config->readBoolEntry( "PlaySound", false ) ) |
119 | device->alarmSound(); | 119 | device->playAlarmSound(); |
120 | 120 | ||
121 | Config cfg( "mail" ); | 121 | Config cfg( "mail" ); |
122 | cfg.setGroup( "Status" ); | 122 | cfg.setGroup( "Status" ); |
123 | cfg.writeEntry( "newMails", m_newMails ); | 123 | cfg.writeEntry( "newMails", m_newMails ); |
diff --git a/noncore/net/mail/taskbarapplet/opie-mailapplet.control b/noncore/net/mail/taskbarapplet/opie-mailapplet.control index 84adc7b..f9822a5 100644 --- a/noncore/net/mail/taskbarapplet/opie-mailapplet.control +++ b/noncore/net/mail/taskbarapplet/opie-mailapplet.control | |||
@@ -3,8 +3,8 @@ Files: plugins/applets/libmailapplet.so* | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 0.4-$SUB_VERSION | 7 | Version: 0.5-$SUB_VERSION |
8 | Depends: task-opie-minimal, libopie1, opie-mail | 8 | Depends: task-opie-minimal, libopiecore2, opie-mail |
9 | Description: A Biff-like mailchecker | 9 | Description: A Biff-like mailchecker |
10 | License: LGPL | 10 | License: LGPL |
diff --git a/noncore/net/mail/taskbarapplet/taskbarapplet.pro b/noncore/net/mail/taskbarapplet/taskbarapplet.pro index c54e87f..e4ac6d1 100644 --- a/noncore/net/mail/taskbarapplet/taskbarapplet.pro +++ b/noncore/net/mail/taskbarapplet/taskbarapplet.pro | |||
@@ -4,9 +4,9 @@ HEADERS += mailapplet.h \ | |||
4 | mailappletimpl.h | 4 | mailappletimpl.h |
5 | SOURCES +=mailapplet.cpp \ | 5 | SOURCES +=mailapplet.cpp \ |
6 | mailappletimpl.cpp | 6 | mailappletimpl.cpp |
7 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/net/mail | 7 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/net/mail |
8 | LIBS +=-lmailwrapper -lqpe -lopie | 8 | LIBS +=-lmailwrapper -lqpe -lopiecore2 |
9 | TARGET =mailapplet | 9 | TARGET =mailapplet |
10 | DESTDIR +=$(OPIEDIR)/plugins/applets/ | 10 | DESTDIR +=$(OPIEDIR)/plugins/applets/ |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index 9ca6383..99965d4 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -8,9 +8,9 @@ | |||
8 | #include <qvaluelist.h> | 8 | #include <qvaluelist.h> |
9 | 9 | ||
10 | #include <qpe/config.h> | 10 | #include <qpe/config.h> |
11 | 11 | ||
12 | #include <opie/ofiledialog.h> | 12 | #include <opie2/ofiledialog.h> |
13 | 13 | ||
14 | #include <libmailwrapper/settings.h> | 14 | #include <libmailwrapper/settings.h> |
15 | #include "composemail.h" | 15 | #include "composemail.h" |
16 | #include "viewmail.h" | 16 | #include "viewmail.h" |
@@ -197,9 +197,9 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
197 | switch(ret) { | 197 | switch(ret) { |
198 | case 0: | 198 | case 0: |
199 | { MimeTypes types; | 199 | { MimeTypes types; |
200 | types.insert( "all", "*" ); | 200 | types.insert( "all", "*" ); |
201 | QString str = OFileDialog::getSaveFileName( 1, | 201 | QString str = Opie::OFileDialog::getSaveFileName( 1, |
202 | "/", item->text( 2 ) , types, 0 ); | 202 | "/", item->text( 2 ) , types, 0 ); |
203 | 203 | ||
204 | if( !str.isEmpty() ) { | 204 | if( !str.isEmpty() ) { |
205 | encodedString*content = m_recMail.Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ); | 205 | encodedString*content = m_recMail.Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ); |