From c2eb77f6b8933b02bd8bd59ec7325da0bfc956cb Mon Sep 17 00:00:00 2001 From: alwin Date: Thu, 19 Feb 2004 13:42:40 +0000 Subject: use stuff from libopie2 ToDo: after merge pim-classes to opie2, do the same with it. --- (limited to 'noncore') 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,6 +1,6 @@ #include -#include +#include #include #include #include @@ -163,7 +163,7 @@ 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 @@ -4,7 +4,7 @@ Priority: optional Section: libs Maintainer: Rajko Albrecht , Juergen Graf , Maximilian Reiß 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 @@ -6,7 +6,7 @@ #include #include #include -#include +#include const QString MHwrapper::wrapperType="MH"; 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 @@ -51,9 +51,9 @@ 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,4 +1,4 @@ -#include +#include #include "opiemail.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 @@ -4,7 +4,7 @@ Priority: optional Section: opie/pim Maintainer: Rajko Albrecht , Juergen Graf , Maximilian Reiß 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 @@ -6,7 +6,7 @@ #include #include -#include +#include #include @@ -116,7 +116,7 @@ void MailApplet::slotCheck() { } } if ( m_config->readBoolEntry( "PlaySound", false ) ) - device->alarmSound(); + device->playAlarmSound(); Config cfg( "mail" ); cfg.setGroup( "Status" ); 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 @@ -4,7 +4,7 @@ Priority: optional Section: opie/applets Maintainer: Rajko Albrecht , Juergen Graf , Maximilian Reiß 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 @@ -5,7 +5,7 @@ HEADERS += mailapplet.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/ 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 @@ -9,7 +9,7 @@ #include -#include +#include #include #include "composemail.h" @@ -198,7 +198,7 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int 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() ) { -- cgit v0.9.0.2