summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/composemail.cpp4
-rw-r--r--noncore/net/mail/libmailwrapper/libmailwrapper.control4
-rw-r--r--noncore/net/mail/libmailwrapper/mhwrapper.cpp2
-rw-r--r--noncore/net/mail/mail.pro4
-rw-r--r--noncore/net/mail/main.cpp2
-rw-r--r--noncore/net/mail/opie-mail.control4
-rw-r--r--noncore/net/mail/taskbarapplet/mailapplet.cpp4
-rw-r--r--noncore/net/mail/taskbarapplet/opie-mailapplet.control4
-rw-r--r--noncore/net/mail/taskbarapplet/taskbarapplet.pro2
-rw-r--r--noncore/net/mail/viewmail.cpp4
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
@@ -2,3 +2,3 @@
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
#include <qpe/resource.h>
@@ -165,3 +165,3 @@ void ComposeMail::addAttachment()
{
- DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" );
+ DocLnk lnk = Opie::OFileDialog::getOpenFileName( 1, "/" );
if ( !lnk.name().isEmpty() ) {
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
@@ -6,4 +6,4 @@ Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.or
Architecture: arm
-Version: 0.4-$SUB_VERSION
-Depends: task-opie-minimal, libopie1, libetpan
+Version: 0.5-$SUB_VERSION
+Depends: task-opie-minimal, libopiecore2, libopieui2, libetpan (>= 0.33pre)
Description: wrapper lib needed by Opie's mailer
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
@@ -8,3 +8,3 @@
#include <qpe/global.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
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
@@ -53,5 +53,5 @@ CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
contains( CONFTEST, y ){
- LIBS += -lqpe -lopie -lmailwrapper -liconv
+ LIBS += -lqpe -lopieui2 -lopiecore2 -lopie -lmailwrapper -liconv
}else{
- LIBS += -lqpe -lopie -lmailwrapper
+ LIBS += -lqpe -lopieui2 -lopiecore2 -lopie -lmailwrapper
}
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,2 +1,2 @@
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
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
@@ -6,4 +6,4 @@ Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.or
Architecture: arm
-Version: 0.4-$SUB_VERSION
-Depends: task-opie-minimal, libopie1, libmailwrapper
+Version: 0.5-$SUB_VERSION
+Depends: task-opie-minimal, libopie1, libopiecore2, libopieui2, libmailwrapper (>= 0.4)
Description: Opie's mail and news client (POP3, IMAP and NNTP)
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
@@ -8,3 +8,3 @@
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
@@ -118,3 +118,3 @@ void MailApplet::slotCheck() {
if ( m_config->readBoolEntry( "PlaySound", false ) )
- device->alarmSound();
+ device->playAlarmSound();
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
@@ -6,4 +6,4 @@ Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.or
Architecture: arm
-Version: 0.4-$SUB_VERSION
-Depends: task-opie-minimal, libopie1, opie-mail
+Version: 0.5-$SUB_VERSION
+Depends: task-opie-minimal, libopiecore2, opie-mail
Description: A Biff-like mailchecker
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
@@ -7,3 +7,3 @@ SOURCES += mailapplet.cpp \
INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/net/mail
-LIBS += -lmailwrapper -lqpe -lopie
+LIBS += -lmailwrapper -lqpe -lopiecore2
TARGET = mailapplet
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
@@ -11,3 +11,3 @@
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
@@ -200,3 +200,3 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
types.insert( "all", "*" );
- QString str = OFileDialog::getSaveFileName( 1,
+ QString str = Opie::OFileDialog::getSaveFileName( 1,
"/", item->text( 2 ) , types, 0 );