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
@@ -1,7 +1,7 @@
#include <qt.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qpe/global.h>
#include <qpe/contact.h>
@@ -162,9 +162,9 @@ void ComposeMail::slotAdjustColumns()
}
void ComposeMail::addAttachment()
{
- DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" );
+ DocLnk lnk = Opie::OFileDialog::getOpenFileName( 1, "/" );
if ( !lnk.name().isEmpty() ) {
Attachment *att = new Attachment( lnk );
(void) new AttachViewItem( attList, att );
}
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*
Priority: optional
Section: libs
Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org>
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
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 @@
#include <qdir.h>
#include <qmessagebox.h>
#include <stdlib.h>
#include <qpe/global.h>
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
const QString MHwrapper::wrapperType="MH";
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 \
INCLUDEPATH += $(OPIEDIR)/include
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
}
TARGET = opiemail
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 @@
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
#include "opiemail.h"
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
Priority: optional
Section: opie/pim
Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org>
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)
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 @@
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qpe/applnk.h>
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
#include <libmailwrapper/settings.h>
#include "mailapplet.h"
@@ -115,9 +115,9 @@ void MailApplet::slotCheck() {
device->setLedState( led, device->ledStateList( led ).contains( Led_BlinkSlow ) ? Led_BlinkSlow : Led_On );
}
}
if ( m_config->readBoolEntry( "PlaySound", false ) )
- device->alarmSound();
+ device->playAlarmSound();
Config cfg( "mail" );
cfg.setGroup( "Status" );
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*
Priority: optional
Section: opie/applets
Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org>
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
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 \
mailappletimpl.h
SOURCES += mailapplet.cpp \
mailappletimpl.cpp
INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/net/mail
-LIBS += -lmailwrapper -lqpe -lopie
+LIBS += -lmailwrapper -lqpe -lopiecore2
TARGET = mailapplet
DESTDIR += $(OPIEDIR)/plugins/applets/
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 @@
#include <qvaluelist.h>
#include <qpe/config.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
#include <libmailwrapper/settings.h>
#include "composemail.h"
#include "viewmail.h"
@@ -197,9 +197,9 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
switch(ret) {
case 0:
{ MimeTypes types;
types.insert( "all", "*" );
- QString str = OFileDialog::getSaveFileName( 1,
+ QString str = Opie::OFileDialog::getSaveFileName( 1,
"/", item->text( 2 ) , types, 0 );
if( !str.isEmpty() ) {
encodedString*content = m_recMail.Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] );