author | zautrix <zautrix> | 2004-10-30 11:40:54 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-30 11:40:54 (UTC) |
commit | 632b43950f1ac2980c281eb8901d797deb0ba971 (patch) (side-by-side diff) | |
tree | 72534bf865fbef61a29d5e8b2e65672c15b432c0 /kmicromail/libmailwrapper | |
parent | 0057c2a8e90346583f606491730cae819d2313ac (diff) | |
download | kdepimpi-632b43950f1ac2980c281eb8901d797deb0ba971.zip kdepimpi-632b43950f1ac2980c281eb8901d797deb0ba971.tar.gz kdepimpi-632b43950f1ac2980c281eb8901d797deb0ba971.tar.bz2 |
made ompi compiling on desktop
-rw-r--r-- | kmicromail/libmailwrapper/generatemail.h | 5 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/libmailwrapper.pro | 64 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mailwrapper.h | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mhwrapper.cpp | 22 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mhwrapper.h | 6 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/settings.h | 1 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 15 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.h | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/storemail.h | 2 |
9 files changed, 90 insertions, 29 deletions
diff --git a/kmicromail/libmailwrapper/generatemail.h b/kmicromail/libmailwrapper/generatemail.h index a767b61..b9f8285 100644 --- a/kmicromail/libmailwrapper/generatemail.h +++ b/kmicromail/libmailwrapper/generatemail.h @@ -3,3 +3,3 @@ -#include <qpe/applnk.h> +//#include <qpe/applnk.h> @@ -7,2 +7,3 @@ #include <libetpan/clist.h> +#include "mailwrapper.h" @@ -12,3 +13,3 @@ class Mail; class RecMail; -class Attachment; + struct mailimf_fields; diff --git a/kmicromail/libmailwrapper/libmailwrapper.pro b/kmicromail/libmailwrapper/libmailwrapper.pro new file mode 100644 index 0000000..2b005d8 --- a/dev/null +++ b/kmicromail/libmailwrapper/libmailwrapper.pro @@ -0,0 +1,64 @@ +TEMPLATE = lib +CONFIG += qt warn_on + +HEADERS = mailwrapper.h \ + imapwrapper.h \ + mailtypes.h \ + pop3wrapper.h \ + abstractmail.h \ + smtpwrapper.h \ + genericwrapper.h \ + mboxwrapper.h \ + settings.h \ + logindialog.h \ + sendmailprogress.h \ + statusmail.h \ + mhwrapper.h \ + nntpwrapper.h \ + generatemail.h \ + storemail.h \ + ../qpe/global.h + +SOURCES = imapwrapper.cpp \ + mailwrapper.cpp \ + mailtypes.cpp \ + pop3wrapper.cpp \ + abstractmail.cpp \ + smtpwrapper.cpp \ + genericwrapper.cpp \ + mboxwrapper.cpp \ + settings.cpp \ + logindialog.cpp \ + sendmailprogress.cpp \ + statusmail.cpp \ + mhwrapper.cpp \ + nntpwrapper.cpp \ + generatemail.cpp \ + storemail.cpp \ + ../qpe/global.cpp + +INTERFACES = logindialogui.ui \ + sendmailprogressui.ui + +INCLUDEPATH += .. ../../microkde ../../microkde/kdecore ../libetpan/include +LIBS += -lssl -lcrypto + +#-lqpe -letpan + +DESTDIR = ../../bin +TARGET = micromailwrapper + +DEFINES += DESKTOP_VERSION +unix : { +OBJECTS_DIR = obj/unix +MOC_DIR = moc/unix +} +win32: { +DEFINES += _WIN32_ +LIBS += mfc71u.lib +QMAKE_LINK += /NODEFAULTLIB:LIBC +#QMAKE_LINK += /NODEFAULTLIB:MSVCRT +#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib +OBJECTS_DIR = obj/win +MOC_DIR = moc/win +} diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h index 2ba908b..88f10da 100644 --- a/kmicromail/libmailwrapper/mailwrapper.h +++ b/kmicromail/libmailwrapper/mailwrapper.h @@ -3,3 +3,3 @@ -#include <qpe/applnk.h> +//#include <qpe/applnk.h> diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp index f4133c0..de6d220 100644 --- a/kmicromail/libmailwrapper/mhwrapper.cpp +++ b/kmicromail/libmailwrapper/mhwrapper.cpp @@ -9,5 +9,5 @@ #include <qpe/global.h> -#include <oprocess.h> #include <klocale.h> -//#include <opie2/odebug.h> +#include <kglobal.h> +//#include <opie2/odebug.h> @@ -317,2 +317,5 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) } + QString delDir = locateLocal( "apps", "kopiemail")+ "localmail"; + qDebug("*****************\ndel %s %s ", delDir.latin1(),tfolder->getName().latin1() ); +#if 0 QString cmd = "rm -rf "+tfolder->getName(); @@ -324,2 +327,3 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) + /* connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), @@ -328,3 +332,3 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); - + */ *process << command; @@ -335,2 +339,3 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) } +#endif qDebug("mail box deleted "); @@ -339,13 +344,2 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) -void MHwrapper::processEnded(OProcess *p) -{ - if (p) delete p; -} - -void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) -{ - QString lineStr = buffer; - QMessageBox::warning( 0, i18n("Error"), lineStr ,i18n("Ok") ); - removeMboxfailed = true; -} diff --git a/kmicromail/libmailwrapper/mhwrapper.h b/kmicromail/libmailwrapper/mhwrapper.h index d1b7d1f..87f8ca1 100644 --- a/kmicromail/libmailwrapper/mhwrapper.h +++ b/kmicromail/libmailwrapper/mhwrapper.h @@ -11,4 +11,2 @@ class encodedString; struct mailmbox_folder; -namespace Opie {namespace Core {class OProcess;}} - class MHwrapper : public Genericwrapper @@ -47,5 +45,3 @@ public: public slots: - /* for deleting maildirs we are using a system call */ - virtual void oprocessStderr(Opie::Core::OProcess*, char *buffer, int ); - virtual void processEnded(Opie::Core::OProcess *); + protected: diff --git a/kmicromail/libmailwrapper/settings.h b/kmicromail/libmailwrapper/settings.h index 61051dd..79567ef 100644 --- a/kmicromail/libmailwrapper/settings.h +++ b/kmicromail/libmailwrapper/settings.h @@ -10,2 +10,3 @@ #include <qlist.h> +#include <qstringlist.h> #include <qdatetime.h> diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp index dee1477..eb07ef1 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.cpp +++ b/kmicromail/libmailwrapper/smtpwrapper.cpp @@ -12,7 +12,10 @@ #include <stdlib.h> -#include <qpe/config.h> +#ifndef DESKTOP_VERSION +//#include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> - +#endif #include <libetpan/libetpan.h> #include <klocale.h> +#include <kglobal.h> +#include <kconfig.h> @@ -26,3 +29,3 @@ SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) m_SmtpAccount = aSmtp; - Config cfg( "mail" ); + KConfig cfg( locateLocal("config", "kopiemail" ) ); cfg.setGroup( "Status" ); @@ -40,4 +43,6 @@ SMTPwrapper::~SMTPwrapper() void SMTPwrapper::emitQCop( int queued ) { +#ifndef DESKTOP_VERSION QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); env << queued; +#endif } @@ -129,3 +134,3 @@ bool SMTPwrapper::smtpSend( mailmime *mail,bool later) { free( data ); - Config cfg( "mail" ); + KConfig cfg( locateLocal("config", "kopiemail" ) ); cfg.setGroup( "Status" ); @@ -449,3 +454,3 @@ bool SMTPwrapper::flushOutbox() { } - Config cfg( "mail" ); + KConfig cfg( locateLocal("config", "kopiemail" ) ); cfg.setGroup( "Status" ); diff --git a/kmicromail/libmailwrapper/smtpwrapper.h b/kmicromail/libmailwrapper/smtpwrapper.h index ec42b56..bdca000 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.h +++ b/kmicromail/libmailwrapper/smtpwrapper.h @@ -4,3 +4,3 @@ -#include <qpe/applnk.h> +//#include <qpe/applnk.h> diff --git a/kmicromail/libmailwrapper/storemail.h b/kmicromail/libmailwrapper/storemail.h index 4433de0..e449f57 100644 --- a/kmicromail/libmailwrapper/storemail.h +++ b/kmicromail/libmailwrapper/storemail.h @@ -3,3 +3,3 @@ -#include <qpe/applnk.h> +//#include <qpe/applnk.h> |