diff options
| author | espringe <[email protected]> | 2010-09-07 03:42:02 +1000 |
|---|---|---|
| committer | espringe <[email protected]> | 2010-09-07 03:42:02 +1000 |
| commit | 4bc466bb23c77c9bc95463511c99ef30d9661092 (patch) | |
| tree | 9bb486e0152e4ddaff5186f090374b6c3fa1d262 | |
| parent | 1d0e779a2f0d7a3afe04207533cfeddf732640d9 (diff) | |
Rename Qtopiamail library to QMF
Library Renames:
libmessageserver -> libqmfmessageserver
libqtopiamail -> libqmf
Directory Changes:
src/libraries/messageserver -> src/libraries/qmfmessageserver
src/libraries/qtopiamail -> src/libraries/qmf
src/plugins/contentmanagers/qtopiamailfile -> qmfstoragemanager
src/plugins/messageservices/qtopiamailfile -> qmfsettings
Class changes:
QtopiamailfileConfigurator -> QmfConfigurator
QtopiamailfileSettings -> QmfSettings
QtopiamailfileServicePlugin -> QmfServicePlugin
QtopiamailfileManager -> QmfStorageManager
There's still a few outstanding changes in the docs / translations
that should be fixed shortly.
100 files changed, 402 insertions, 395 deletions
diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro index e2e10df8..f0a11774 100644 --- a/benchmarks/tst_messageserver/tst_messageserver.pro +++ b/benchmarks/tst_messageserver/tst_messageserver.pro @@ -1,6 +1,6 @@ TEMPLATE = app CONFIG += qtestlib unittest -CONFIG += messageserver qtopiamail +CONFIG += qmfmessageserver qmf TARGET = tst_messageserver target.path += $$QMF_INSTALL_ROOT/tests @@ -20,17 +20,17 @@ DEFINES += PLUGIN_STATIC_LINK IMAP_PLUGIN=$$BASE/src/plugins/messageservices/imap/ MESSAGE_SERVER=$$BASE/src/tools/messageserver -INCLUDEPATH += . 3rdparty $$BASE/src/libraries/qtopiamail \ - $$BASE/src/libraries/qtopiamail/support \ - $$BASE/src/libraries/messageserver \ +INCLUDEPATH += . 3rdparty $$BASE/src/libraries/qmf \ + $$BASE/src/libraries/qmf/support \ + $$BASE/src/libraries/qmfmessageserver \ $$IMAP_PLUGIN \ $$MESSAGE_SERVER -LIBS += -L$$BASE/src/libraries/messageserver/build \ - -L$$BASE/src/libraries/qtopiamail/build +LIBS += -L$$BASE/src/libraries/qmfmessageserver/build \ + -L$$BASE/src/libraries/qmf/build -QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qtopiamail \ - -Wl,-rpath,$$BASE/src/libraries/messageserver +QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qmf \ + -Wl,-rpath,$$BASE/src/libraries/qmfmessageserver HEADERS += benchmarkcontext.h \ qscopedconnection.h \ @@ -79,8 +79,8 @@ mac:contains(QT_CONFIG,qt_framework):!plugin { QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS } -qtopiamail:qtAddLibrary(qtopiamail) -messageserver:qtAddLibrary(messageserver) +qmf:qtAddLibrary(qmf) +qmfmessageserver:qtAddLibrary(qmfmessageserver) qmfutil:qtAddLibrary(qmfutil) diff --git a/doc/src/messageserver.qdoc b/doc/src/messageserver.qdoc index e3894774..1fd923b9 100644 --- a/doc/src/messageserver.qdoc +++ b/doc/src/messageserver.qdoc @@ -77,7 +77,7 @@ Other protocols can be supported by providing implementations as plugins. \section1 Interface -MessageServer communicates with clients via a QtopiaChannel. The recommended method of passing messages over this channel is for each client to instantiate an object of the QMailMessageServer class, which converts between IPC messages and local signals and slots. +MessageServer communicates with clients via QCop. The only supported method of passing messages over this channel is for each client to instantiate an object of the QMailMessageServer class, which converts between IPC messages and local signals and slots. Some actions of the MessageServer process affect the Messaging Framework data store directly. A client can respond to these actions by connecting to the relevant signals of the QMailStore class, such as QMailStore::messagesAdded(), and QMailStore::messagesRemoved(). diff --git a/doc/src/qmf.qdocconf b/doc/src/qmf.qdocconf index 925c9cbd..87c51664 100644 --- a/doc/src/qmf.qdocconf +++ b/doc/src/qmf.qdocconf @@ -19,25 +19,25 @@ qhp.QMF.extraFiles = \ imagedirs = images -headerdirs = ../../src/libraries/qtopiamail \ - ../../src/libraries/messageserver \ +headerdirs = ../../src/libraries/qmf \ + ../../src/libraries/qmfmessageserver \ ../../examples/qtmail/lib/qmfutil \ ../../src/plugins/messageservices/imap \ ../../src/plugins/messageservices/pop \ ../../src/plugins/messageservices/smtp \ - ../../src/plugins/messageservices/qtopiamailfile \ - ../../src/plugins/contentmanagers/qtopiamailfile \ + ../../src/plugins/messageservices/qmfsettings \ + ../../src/plugins/contentmanagers/qmfstoragemanager \ ../../examples/messagingaccounts \ ../../src/tools/messageserver -sourcedirs = ../../src/libraries/qtopiamail \ - ../../src/libraries/messageserver \ +sourcedirs = ../../src/libraries/qmf \ + ../../src/libraries/qmfmessageserver \ ../../examples/qtmail/lib/qmfutil \ ../../src/plugins/messageservices/imap \ ../../src/plugins/messageservices/pop \ ../../src/plugins/messageservices/smtp \ - ../../src/plugins/messageservices/qtopiamailfile \ - ../../src/plugins/contentmanagers/qtopiamailfile \ + ../../src/plugins/messageservices/qmfsettings \ + ../../src/plugins/contentmanagers/qmfstoragemanager \ ../../examples/messagingaccounts \ ../../src/tools/messageserver \ ../../examples/messagenavigator \ @@ -111,7 +111,7 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ QTOPIA_ENABLE_EXPORT \ QTOPIAAUDIO_EXPORT \ QTOPIABASE_EXPORT \ - QTOPIAMAIL_EXPORT \ + QMF_EXPORT \ QTOPIAMEDIA_EXPORT \ QTOPIAPIM_EXPORT \ QTOPIAPHONE_EXPORT \ diff --git a/examples/messagingaccounts/messagingaccounts.pro b/examples/messagingaccounts/messagingaccounts.pro index 783824db..0801f29f 100644 --- a/examples/messagingaccounts/messagingaccounts.pro +++ b/examples/messagingaccounts/messagingaccounts.pro @@ -1,23 +1,23 @@ TEMPLATE = app TARGET = messagingaccounts target.path += $$QMF_INSTALL_ROOT/bin -CONFIG += qtopiamail messageserver +CONFIG += qmf qmfmessageserver DEPENDPATH += . QTMAIL_EXAMPLE=../qtmail -INCLUDEPATH += . ../../src/libraries/qtopiamail \ - ../../src/libraries/qtopiamail/support \ - ../../src/libraries/messageserver \ +INCLUDEPATH += . ../../src/libraries/qmf \ + ../../src/libraries/qmf/support \ + ../../src/libraries/qmfmessageserver \ $$QTMAIL_EXAMPLE/app \ $$QTMAIL_EXAMPLE/libs/qmfutil -LIBS += -L../../src/libraries/qtopiamail/build \ - -L../../src/libraries/messageserver/build +LIBS += -L../../src/libraries/qmf/build \ + -L../../src/libraries/qmfmessageserver/build -macx:LIBS += -F../../src/libraries/qtopiamail/build \ - -F../../src/libraries/messageserver/build +macx:LIBS += -F../../src/libraries/qmf/build \ + -F../../src/libraries/qmfmessageserver/build HEADERS += $$QTMAIL_EXAMPLE/app/accountsettings.h \ $$QTMAIL_EXAMPLE/app/editaccount.h \ diff --git a/examples/qtmail/app/app.pro b/examples/qtmail/app/app.pro index daa5be8a..b2a3ef15 100644 --- a/examples/qtmail/app/app.pro +++ b/examples/qtmail/app/app.pro @@ -1,22 +1,22 @@ TEMPLATE = app TARGET = qtmail -CONFIG += qmfutil qtopiamail messageserver +CONFIG += qmfutil qmf qmfmessageserver target.path += $$QMF_INSTALL_ROOT/bin DEPENDPATH += . -INCLUDEPATH += . ../../../src/libraries/qtopiamail \ - ../../../src/libraries/qtopiamail/support \ +INCLUDEPATH += . ../../../src/libraries/qmf \ + ../../../src/libraries/qmf/support \ ../libs/qmfutil \ - ../../../src/libraries/messageserver + ../../../src/libraries/qmfmessageserver -LIBS += -L../../../src/libraries/qtopiamail/build \ +LIBS += -L../../../src/libraries/qmf/build \ -L../libs/qmfutil/build \ - -L../../../src/libraries/messageserver/build + -L../../../src/libraries/qmfmessageserver/build -macx:LIBS += -F../../../src/libraries/qtopiamail/build \ +macx:LIBS += -F../../../src/libraries/qmf/build \ -F../../libs/qmfutil/build \ - -F../../../src/libraries/messageserver/build + -F../../../src/libraries/qmf/build HEADERS += emailclient.h \ messagelistview.h \ diff --git a/examples/qtmail/app/emailclient.cpp b/examples/qtmail/app/emailclient.cpp index 7390ef46..1bc2d549 100644 --- a/examples/qtmail/app/emailclient.cpp +++ b/examples/qtmail/app/emailclient.cpp @@ -539,7 +539,7 @@ void EmailClient::displayCachedMail() void EmailClient::resumeInterruptedComposition() { - QSettings mailconf("Trolltech", "qtmail"); + QSettings mailconf("Nokia", "qtmail"); mailconf.beginGroup("restart"); QVariant var = mailconf.value("lastDraftId"); @@ -1550,7 +1550,7 @@ void EmailClient::accessError(const QString &folderName) void EmailClient::readSettings() { - QSettings mailconf("Trolltech","qtmail"); + QSettings mailconf("Nokia","qtmail"); mailconf.beginGroup("qtmailglobal"); mailconf.endGroup(); @@ -1567,7 +1567,7 @@ void EmailClient::readSettings() bool EmailClient::saveSettings() { const int QTMAIL_CONFIG_VERSION = 100; - QSettings mailconf("Trolltech","qtmail"); + QSettings mailconf("Nokia","qtmail"); mailconf.beginGroup("qtmailglobal"); mailconf.remove(""); @@ -2296,7 +2296,7 @@ void EmailClient::quit() if (lastDraftId.isValid()) { // Store this value to remind the user on next startup - QSettings mailconf("Trolltech", "qtmail"); + QSettings mailconf("Nokia", "qtmail"); mailconf.beginGroup("restart"); mailconf.setValue("lastDraftId", lastDraftId.toULongLong() ); mailconf.endGroup(); diff --git a/examples/qtmail/app/readmail.cpp b/examples/qtmail/app/readmail.cpp index f7fff61a..4b7e2c26 100644 --- a/examples/qtmail/app/readmail.cpp +++ b/examples/qtmail/app/readmail.cpp @@ -228,6 +228,7 @@ void ReadMail::linkClicked(const QUrl &lnk) // strip leading 'mailto:' emit sendMessageTo( QMailAddress(str.mid(7)), mail.messageType() ); } else if (mail.messageType() == QMailMessage::System && str.startsWith(QLatin1String("qtopiaservice:"))) { + // TODO: This relevant anymore? int commandPos = str.indexOf( QLatin1String( "::" ) ) + 2; int argPos = str.indexOf( '?' ) + 1; QString service = str.mid( 14, commandPos - 16 ); diff --git a/examples/qtmail/app/writemail.cpp b/examples/qtmail/app/writemail.cpp index ab6eca5a..52116db3 100644 --- a/examples/qtmail/app/writemail.cpp +++ b/examples/qtmail/app/writemail.cpp @@ -632,7 +632,7 @@ bool WriteMail::largeAttachments() static int limit = 0; if (limit == 0) { const QString key("emailattachlimitkb"); - QSettings mailconf("Trolltech","qtmail"); + QSettings mailconf("Nokia","qtmail"); mailconf.beginGroup("qtmailglobal"); if (mailconf.contains(key)) diff --git a/examples/qtmail/libs/qmfutil/qmfutil.pro b/examples/qtmail/libs/qmfutil/qmfutil.pro index dfce9d5a..fd600ba9 100644 --- a/examples/qtmail/libs/qmfutil/qmfutil.pro +++ b/examples/qtmail/libs/qmfutil/qmfutil.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += warn_on -CONFIG += qtopiamail +CONFIG += qmf TARGET = qmfutil target.path += $$QMF_INSTALL_ROOT/lib @@ -12,10 +12,10 @@ symbian: { DEPENDPATH += . -INCLUDEPATH += . ../../../../src/libraries/qtopiamail ../../../../src/libraries/qtopiamail/support +INCLUDEPATH += . ../../../../src/libraries/qmf ../../../../src/libraries/qmf/support -macx:LIBS += -F../../../../libraries/qtopiamail/build -LIBS += -L../../../../src/libraries/qtopiamail/build +macx:LIBS += -F../../../../libraries/qmf/build +LIBS += -L../../../../src/libraries/qmf/build HEADERS += emailfoldermodel.h \ emailfolderview.h \ diff --git a/examples/qtmail/plugins/composers/email/email.pro b/examples/qtmail/plugins/composers/email/email.pro index 90849f4c..9fec04b3 100644 --- a/examples/qtmail/plugins/composers/email/email.pro +++ b/examples/qtmail/plugins/composers/email/email.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = emailcomposer -CONFIG += qtopiamail qmfutil plugin +CONFIG += qmf qmfutil plugin target.path += $$QMF_INSTALL_ROOT/plugins/composers @@ -9,13 +9,13 @@ DEFINES += PLUGIN_INTERNAL DEPENDPATH += . INCLUDEPATH += . ../../../libs/qmfutil \ - ../../../../../src/libraries/qtopiamail \ - ../../../../../src/libraries/qtopiamail/support + ../../../../../src/libraries/qmf \ + ../../../../../src/libraries/qmf/support -LIBS += -L../../../../../src/libraries/qtopiamail/build \ +LIBS += -L../../../../../src/libraries/qmf/build \ -L../../../libs/qmfutil/build -macx:LIBS += -F../../../../../libraries/qtopiamail/build \ +macx:LIBS += -F../../../../../libraries/qmf/build \ -F../../../libs/qmfutil/build diff --git a/examples/qtmail/plugins/composers/email/emailcomposer.cpp b/examples/qtmail/plugins/composers/email/emailcomposer.cpp index b4d68de5..7b6a2f2f 100644 --- a/examples/qtmail/plugins/composers/email/emailcomposer.cpp +++ b/examples/qtmail/plugins/composers/email/emailcomposer.cpp @@ -831,7 +831,7 @@ QMailMessage EmailComposerInterface::message() const // Store the location of this file for future reference const QMailMessagePart &mailPart(mail.partAt(mail.partCount() - 1)); - QString name("qtopiamail-file-location-" + mailPart.location().toString(false)); + QString name("qmf-file-location-" + mailPart.location().toString(false)); mail.setCustomField(name, filePath); } } @@ -935,7 +935,7 @@ void EmailComposerInterface::create(const QMailMessage& sourceMail) const QMailMessagePart &part(sourceMail.partAt(i)); // See if we have a filename to link to - QString name("qtopiamail-file-location-" + part.location().toString(false)); + QString name("qmf-file-location-" + part.location().toString(false)); QString contentLocation = sourceMail.customField(name); if (contentLocation.isEmpty()) { // See if we can use the value in the message (remove any folded whitespace) diff --git a/examples/qtmail/plugins/viewers/generic/generic.pro b/examples/qtmail/plugins/viewers/generic/generic.pro index 48fba5ef..2179057c 100644 --- a/examples/qtmail/plugins/viewers/generic/generic.pro +++ b/examples/qtmail/plugins/viewers/generic/generic.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = genericviewer -CONFIG += qtopiamail qmfutil plugin +CONFIG += qmf qmfutil plugin target.path += $$QMF_INSTALL_ROOT/plugins/viewers @@ -13,13 +13,13 @@ contains(QT_CONFIG,webkit){ DEPENDPATH += . INCLUDEPATH += . ../../../libs/qmfutil \ - ../../../../../src/libraries/qtopiamail \ - ../../../../../src/libraries/qtopiamail/support + ../../../../../src/libraries/qmf \ + ../../../../../src/libraries/qmf/support -LIBS += -L../../../../../src/libraries/qtopiamail/build \ +LIBS += -L../../../../../src/libraries/qmf/build \ -L../../../libs/qmfutil/build -LIBS += -F../../../../../src/libraries/qtopiamail/build \ +LIBS += -F../../../../../src/libraries/qmf/build \ -F../../../libs/qmfutil/build HEADERS += attachmentoptions.h browserwidget.h genericviewer.h diff --git a/examples/serverobserver/serverobserver.pro b/examples/serverobserver/serverobserver.pro index 0a7ade39..e036c3a5 100644 --- a/examples/serverobserver/serverobserver.pro +++ b/examples/serverobserver/serverobserver.pro @@ -1,18 +1,18 @@ TEMPLATE = app TARGET = serverobserver target.path += $$QMF_INSTALL_ROOT/bin -CONFIG += qtopiamail messageserver +CONFIG += qmf qmfmessageserver DEPENDPATH += . -INCLUDEPATH += . ../../src/libraries/qtopiamail \ - ../../src/libraries/qtopiamail/support \ - ../../src/libraries/messageserver \ +INCLUDEPATH += . ../../src/libraries/qmf \ + ../../src/libraries/qmf/support \ + ../../src/libraries/qmfmessageserver \ -LIBS += -L../../src/libraries/qtopiamail/build \ - -L../../src/libraries/messageserver/build +LIBS += -L../../src/libraries/qmf/build \ + -L../../src/libraries/qmfmessageserver/build -macx:LIBS += -F../../src/libraries/qtopiamail/build \ - -F../../src/libraries/messageserver/build +macx:LIBS += -F../../src/libraries/qmf/build \ + -F../../src/libraries/qmfmessageserver/build HEADERS += serverobserver.h diff --git a/messagingframework.pro b/messagingframework.pro index 1d853995..7ff28987 100644 --- a/messagingframework.pro +++ b/messagingframework.pro @@ -1,13 +1,13 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = src/libraries/qtopiamail \ - src/libraries/messageserver \ +SUBDIRS = src/libraries/qmf \ + src/libraries/qmfmessageserver \ src/plugins/messageservices/imap \ src/plugins/messageservices/pop \ src/plugins/messageservices/smtp \ - src/plugins/messageservices/qtopiamailfile \ - src/plugins/contentmanagers/qtopiamailfile \ + src/plugins/messageservices/qmfsettings \ + src/plugins/contentmanagers/qmfstoragemanager \ src/tools/messageserver \ tests \ examples/qtmail/libs/qmfutil \ diff --git a/src/libraries/qmf/locks_win32.cpp b/src/libraries/qmf/locks_win32.cpp index fb5bf1db..ddb9c66b 100644 --- a/src/libraries/qmf/locks_win32.cpp +++ b/src/libraries/qmf/locks_win32.cpp @@ -61,7 +61,7 @@ QString pathIdentifier(const QString &path, int id) key.replace(QChar('\\'), QChar('/')); // Object names do not need to correspond to paths that actually exist on Win32 - return QString("qtopiamail-%1-%2").arg(key).arg(id); + return QString("qmf-%1-%2").arg(key).arg(id); } } diff --git a/src/libraries/qmf/longstream.cpp b/src/libraries/qmf/longstream.cpp index aeae095b..53221612 100644 --- a/src/libraries/qmf/longstream.cpp +++ b/src/libraries/qmf/longstream.cpp @@ -62,7 +62,7 @@ /* Helper class to reduce memory usage while downloading large mails */ LongStream::LongStream() { - QString tmpName( LongStream::tempDir() + QLatin1String( "qtopiamail" ) ); + QString tmpName( LongStream::tempDir() + QLatin1String( "longstream" ) ); len = 0; appendedBytes = minCheck; @@ -111,7 +111,7 @@ QString LongStream::detach() tmpFile->close(); delete tmpFile; - QString tmpName( LongStream::tempDir() + QLatin1String( "qtopiamail" ) ); + QString tmpName( LongStream::tempDir() + QLatin1String( "longstream" ) ); tmpFile = new QTemporaryFile( tmpName + QLatin1String( ".XXXXXX" )); tmpFile->open(); @@ -283,7 +283,7 @@ QString LongStream::tempDir() void LongStream::cleanupTempFiles() { - QDir dir( LongStream::tempDir(), "qtopiamail.*" ); + QDir dir( LongStream::tempDir(), "longstream.*" ); QStringList list = dir.entryList(); for (int i = 0; i < list.size(); ++i) { QFile file( LongStream::tempDir() + list.at(i) ); diff --git a/src/libraries/qmf/longstream_p.h b/src/libraries/qmf/longstream_p.h index 99e3432b..622e681c 100644 --- a/src/libraries/qmf/longstream_p.h +++ b/src/libraries/qmf/longstream_p.h @@ -63,7 +63,7 @@ class QDataStream; QT_END_NAMESPACE; -class QTOPIAMAIL_EXPORT LongStream +class QMF_EXPORT LongStream { public: LongStream(); diff --git a/src/libraries/qmf/longstring_p.h b/src/libraries/qmf/longstring_p.h index 65cbc2bf..a106ca74 100644 --- a/src/libraries/qmf/longstring_p.h +++ b/src/libraries/qmf/longstring_p.h @@ -67,7 +67,7 @@ QT_END_NAMESPACE; class LongStringPrivate; -class QTOPIAMAIL_EXPORT LongString +class QMF_EXPORT LongString { public: LongString(); diff --git a/src/libraries/qmf/qmailaccount.h b/src/libraries/qmf/qmailaccount.h index ddac7bee..20edd051 100644 --- a/src/libraries/qmf/qmailaccount.h +++ b/src/libraries/qmf/qmailaccount.h @@ -65,7 +65,7 @@ class QTimer; QT_END_NAMESPACE; -class QTOPIAMAIL_EXPORT QMailAccount +class QMF_EXPORT QMailAccount { public: static const quint64 &SynchronizationEnabled; diff --git a/src/libraries/qmf/qmailaccountconfiguration.h b/src/libraries/qmf/qmailaccountconfiguration.h index 72cd38fc..0ad1affe 100644 --- a/src/libraries/qmf/qmailaccountconfiguration.h +++ b/src/libraries/qmf/qmailaccountconfiguration.h @@ -51,13 +51,13 @@ class QMailAccountConfigurationPrivate; -class QTOPIAMAIL_EXPORT QMailAccountConfiguration +class QMF_EXPORT QMailAccountConfiguration { class ConfigurationValues; class ServiceConfigurationPrivate; public: - class QTOPIAMAIL_EXPORT ServiceConfiguration + class QMF_EXPORT ServiceConfiguration { public: ServiceConfiguration(); diff --git a/src/libraries/qmf/qmailaccountkey.h b/src/libraries/qmf/qmailaccountkey.h index f25d67b6..e5282449 100644 --- a/src/libraries/qmf/qmailaccountkey.h +++ b/src/libraries/qmf/qmailaccountkey.h @@ -58,7 +58,7 @@ template <typename Key> class MailKeyImpl; -class QTOPIAMAIL_EXPORT QMailAccountKey +class QMF_EXPORT QMailAccountKey { public: enum Property diff --git a/src/libraries/qmf/qmailaccountlistmodel.h b/src/libraries/qmf/qmailaccountlistmodel.h index e938744e..d458c7bc 100644 --- a/src/libraries/qmf/qmailaccountlistmodel.h +++ b/src/libraries/qmf/qmailaccountlistmodel.h @@ -48,7 +48,7 @@ class QMailAccountListModelPrivate; -class QTOPIAMAIL_EXPORT QMailAccountListModel : public QAbstractListModel +class QMF_EXPORT QMailAccountListModel : public QAbstractListModel { Q_OBJECT diff --git a/src/libraries/qmf/qmailaccountsortkey.h b/src/libraries/qmf/qmailaccountsortkey.h index 774c475b..0ab0c68d 100644 --- a/src/libraries/qmf/qmailaccountsortkey.h +++ b/src/libraries/qmf/qmailaccountsortkey.h @@ -50,7 +50,7 @@ class QMailAccountSortKeyPrivate; -class QTOPIAMAIL_EXPORT QMailAccountSortKey +class QMF_EXPORT QMailAccountSortKey { public: enum Property diff --git a/src/libraries/qmf/qmailaddress.h b/src/libraries/qmf/qmailaddress.h index 01c3528a..ddcdd578 100644 --- a/src/libraries/qmf/qmailaddress.h +++ b/src/libraries/qmf/qmailaddress.h @@ -51,7 +51,7 @@ class QMailAddressPrivate; -class QTOPIAMAIL_EXPORT QMailAddress +class QMF_EXPORT QMailAddress { public: QMailAddress(); diff --git a/src/libraries/qmf/qmailcodec.cpp b/src/libraries/qmf/qmailcodec.cpp index 78f6902c..f005be42 100644 --- a/src/libraries/qmf/qmailcodec.cpp +++ b/src/libraries/qmf/qmailcodec.cpp @@ -47,11 +47,11 @@ #include <ctype.h> // Allow these values to be reduced from test harness code: -int QTOPIAMAIL_EXPORT MaxCharacters = QMailCodec::ChunkCharacters; +int QMF_EXPORT MaxCharacters = QMailCodec::ChunkCharacters; // Must be an even multiple of 4: -int QTOPIAMAIL_EXPORT Base64MaxLineLength = 76; +int QMF_EXPORT Base64MaxLineLength = 76; // Can be any number: -int QTOPIAMAIL_EXPORT QuotedPrintableMaxLineLength = 74; +int QMF_EXPORT QuotedPrintableMaxLineLength = 74; /*! diff --git a/src/libraries/qmf/qmailcodec.h b/src/libraries/qmf/qmailcodec.h index 09f70c47..92912d78 100644 --- a/src/libraries/qmf/qmailcodec.h +++ b/src/libraries/qmf/qmailcodec.h @@ -48,7 +48,7 @@ #include <QString> #include <QTextStream> -class QTOPIAMAIL_EXPORT QMailCodec +class QMF_EXPORT QMailCodec { public: enum { ChunkCharacters = 8192 }; @@ -83,7 +83,7 @@ protected: virtual void decodeChunk(QDataStream& out, const char* in, int length, bool finalChunk) = 0; }; -class QTOPIAMAIL_EXPORT QMailBase64Codec : public QMailCodec +class QMF_EXPORT QMailBase64Codec : public QMailCodec { public: enum ContentType { Text, Binary }; @@ -111,7 +111,7 @@ private: unsigned char _lastChar; }; -class QTOPIAMAIL_EXPORT QMailQuotedPrintableCodec : public QMailCodec +class QMF_EXPORT QMailQuotedPrintableCodec : public QMailCodec { public: enum ContentType { Text, Binary }; @@ -137,7 +137,7 @@ private: unsigned char _decodeLastChar; }; -class QTOPIAMAIL_EXPORT QMailPassThroughCodec : public QMailCodec +class QMF_EXPORT QMailPassThroughCodec : public QMailCodec { virtual QString name() const; @@ -146,7 +146,7 @@ protected: virtual void decodeChunk(QDataStream& out, const char* in, int length, bool finalChunk); }; -class QTOPIAMAIL_EXPORT QMailLineEndingCodec : public QMailCodec +class QMF_EXPORT QMailLineEndingCodec : public QMailCodec { virtual QString name() const; diff --git a/src/libraries/qmf/qmailcontentmanager.cpp b/src/libraries/qmf/qmailcontentmanager.cpp index 68637ebd..be3689e1 100644 --- a/src/libraries/qmf/qmailcontentmanager.cpp +++ b/src/libraries/qmf/qmailcontentmanager.cpp @@ -152,8 +152,8 @@ QString QMailContentManagerFactory::defaultScheme() if (list.isEmpty()) return QString(); - if (list.contains("qtopiamailfile")) - return "qtopiamailfile"; + if (list.contains("qmfstoragemanager")) + return "qmfstoragemanager"; else return list.first(); } diff --git a/src/libraries/qmf/qmailcontentmanager.h b/src/libraries/qmf/qmailcontentmanager.h index 251fe28f..f9639e68 100644 --- a/src/libraries/qmf/qmailcontentmanager.h +++ b/src/libraries/qmf/qmailcontentmanager.h @@ -52,7 +52,7 @@ class QMailMessage; class QMailContentManager; -class QTOPIAMAIL_EXPORT QMailContentManagerFactory +class QMF_EXPORT QMailContentManagerFactory { public: static QStringList schemes(); @@ -67,7 +67,7 @@ public: }; -struct QTOPIAMAIL_EXPORT QMailContentManagerPluginInterface : public QFactoryInterface +struct QMF_EXPORT QMailContentManagerPluginInterface : public QFactoryInterface { virtual QString key() const = 0; virtual QMailContentManager *create() = 0; @@ -76,13 +76,13 @@ struct QTOPIAMAIL_EXPORT QMailContentManagerPluginInterface : public QFactoryInt QT_BEGIN_NAMESPACE -#define QMailContentManagerPluginInterface_iid "com.trolltech.Qtopia.Qtopiamail.QMailContentManagerPluginInterface" +#define QMailContentManagerPluginInterface_iid "com.nokia.QMailContentManagerPluginInterface" Q_DECLARE_INTERFACE(QMailContentManagerPluginInterface, QMailContentManagerPluginInterface_iid) QT_END_NAMESPACE; -class QTOPIAMAIL_EXPORT QMailContentManagerPlugin : public QObject, public QMailContentManagerPluginInterface +class QMF_EXPORT QMailContentManagerPlugin : public QObject, public QMailContentManagerPluginInterface { Q_OBJECT Q_INTERFACES(QMailContentManagerPluginInterface:QFactoryInterface) @@ -95,7 +95,7 @@ public: }; -class QTOPIAMAIL_EXPORT QMailContentManager +class QMF_EXPORT QMailContentManager { friend class QMailManagerContentFactory; diff --git a/src/libraries/qmf/qmaildisconnected.h b/src/libraries/qmf/qmaildisconnected.h index 35ee86c9..76590e25 100644 --- a/src/libraries/qmf/qmaildisconnected.h +++ b/src/libraries/qmf/qmaildisconnected.h @@ -46,7 +46,7 @@ #include "qmailmessagekey.h" #include "qmailfolder.h" -class QTOPIAMAIL_EXPORT QMailDisconnected +class QMF_EXPORT QMailDisconnected { public: static QMailMessageKey destinationKey(const QMailFolderId &folderId); diff --git a/src/libraries/qmf/qmailfolder.h b/src/libraries/qmf/qmailfolder.h index ba62afcd..aebb6e91 100644 --- a/src/libraries/qmf/qmailfolder.h +++ b/src/libraries/qmf/qmailfolder.h @@ -51,7 +51,7 @@ class QMailFolderPrivate; -class QTOPIAMAIL_EXPORT QMailFolder : public QMailFolderFwd +class QMF_EXPORT QMailFolder : public QMailFolderFwd { public: enum StandardFolder { diff --git a/src/libraries/qmf/qmailfolderfwd.h b/src/libraries/qmf/qmailfolderfwd.h index 576bfcd4..11a47f00 100644 --- a/src/libraries/qmf/qmailfolderfwd.h +++ b/src/libraries/qmf/qmailfolderfwd.h @@ -44,7 +44,7 @@ #include "qmailglobal.h" -class QTOPIAMAIL_EXPORT QMailFolderFwd +class QMF_EXPORT QMailFolderFwd { public: enum PredefinedFolderId { LocalStorageFolderId = 1 }; diff --git a/src/libraries/qmf/qmailfolderkey.h b/src/libraries/qmf/qmailfolderkey.h index 1176b130..b85b5757 100644 --- a/src/libraries/qmf/qmailfolderkey.h +++ b/src/libraries/qmf/qmailfolderkey.h @@ -58,7 +58,7 @@ class QMailFolderKeyPrivate; template <typename Key> class MailKeyImpl; -class QTOPIAMAIL_EXPORT QMailFolderKey +class QMF_EXPORT QMailFolderKey { public: enum Property diff --git a/src/libraries/qmf/qmailfoldersortkey.h b/src/libraries/qmf/qmailfoldersortkey.h index 9ae0da32..fc1e73ed 100644 --- a/src/libraries/qmf/qmailfoldersortkey.h +++ b/src/libraries/qmf/qmailfoldersortkey.h @@ -50,7 +50,7 @@ class QMailFolderSortKeyPrivate; -class QTOPIAMAIL_EXPORT QMailFolderSortKey +class QMF_EXPORT QMailFolderSortKey { public: enum Property diff --git a/src/libraries/qmf/qmailid.h b/src/libraries/qmf/qmailid.h index 9940ee79..a099aa43 100644 --- a/src/libraries/qmf/qmailid.h +++ b/src/libraries/qmf/qmailid.h @@ -51,7 +51,7 @@ class MailIdPrivate; -class QTOPIAMAIL_EXPORT MailId +class QMF_EXPORT MailId { private: friend class QMailAccountId; @@ -81,7 +81,7 @@ public: }; -class QTOPIAMAIL_EXPORT QMailAccountId : private MailId +class QMF_EXPORT QMailAccountId : private MailId { public: QMailAccountId(); @@ -103,12 +103,12 @@ public: template <typename Stream> void serialize(Stream &stream) const; template <typename Stream> void deserialize(Stream &stream); - friend QTOPIAMAIL_EXPORT QDebug& operator<<(QDebug&, const QMailAccountId&); - friend QTOPIAMAIL_EXPORT QTextStream& operator <<(QTextStream&, const QMailAccountId&); + friend QMF_EXPORT QDebug& operator<<(QDebug&, const QMailAccountId&); + friend QMF_EXPORT QTextStream& operator <<(QTextStream&, const QMailAccountId&); }; -class QTOPIAMAIL_EXPORT QMailFolderId : private MailId +class QMF_EXPORT QMailFolderId : private MailId { public: QMailFolderId(); @@ -131,12 +131,12 @@ public: template <typename Stream> void serialize(Stream &stream) const; template <typename Stream> void deserialize(Stream &stream); - friend QTOPIAMAIL_EXPORT QDebug& operator<<(QDebug&, const QMailFolderId&); - friend QTOPIAMAIL_EXPORT QTextStream& operator<<(QTextStream&, const QMailFolderId&); + friend QMF_EXPORT QDebug& operator<<(QDebug&, const QMailFolderId&); + friend QMF_EXPORT QTextStream& operator<<(QTextStream&, const QMailFolderId&); }; -class QTOPIAMAIL_EXPORT QMailMessageId : private MailId +class QMF_EXPORT QMailMessageId : private MailId { public: QMailMessageId(); @@ -158,8 +158,8 @@ public: template <typename Stream> void serialize(Stream &stream) const; template <typename Stream> void deserialize(Stream &stream); - friend QTOPIAMAIL_EXPORT QDebug& operator<<(QDebug&, const QMailMessageId&); - friend QTOPIAMAIL_EXPORT QTextStream& operator <<(QTextStream&, const QMailMessageId&); + friend QMF_EXPORT QDebug& operator<<(QDebug&, const QMailMessageId&); + friend QMF_EXPORT QTextStream& operator <<(QTextStream&, const QMailMessageId&); }; @@ -167,15 +167,15 @@ typedef QList<QMailAccountId> QMailAccountIdList; typedef QList<QMailFolderId> QMailFolderIdList; typedef QList<QMailMessageId> QMailMessageIdList; -QTOPIAMAIL_EXPORT QDebug& operator<< (QDebug& debug, const MailId &id); -QTOPIAMAIL_EXPORT QDebug& operator<< (QDebug& debug, const QMailAccountId &id); -QTOPIAMAIL_EXPORT QDebug& operator<< (QDebug& debug, const QMailFolderId &id); -QTOPIAMAIL_EXPORT QDebug& operator<< (QDebug& debug, const QMailMessageId &id); +QMF_EXPORT QDebug& operator<< (QDebug& debug, const MailId &id); +QMF_EXPORT QDebug& operator<< (QDebug& debug, const QMailAccountId &id); +QMF_EXPORT QDebug& operator<< (QDebug& debug, const QMailFolderId &id); +QMF_EXPORT QDebug& operator<< (QDebug& debug, const QMailMessageId &id); -QTOPIAMAIL_EXPORT QTextStream& operator<< (QTextStream& s, const MailId &id); -QTOPIAMAIL_EXPORT QTextStream& operator<< (QTextStream& s, const QMailAccountId &id); -QTOPIAMAIL_EXPORT QTextStream& operator<< (QTextStream& s, const QMailFolderId &id); -QTOPIAMAIL_EXPORT QTextStream& operator<< (QTextStream& s, const QMailMessageId &id); +QMF_EXPORT QTextStream& operator<< (QTextStream& s, const MailId &id); +QMF_EXPORT QTextStream& operator<< (QTextStream& s, const QMailAccountId &id); +QMF_EXPORT QTextStream& operator<< (QTextStream& s, const QMailFolderId &id); +QMF_EXPORT QTextStream& operator<< (QTextStream& s, const QMailMessageId &id); Q_DECLARE_USER_METATYPE(MailId); Q_DECLARE_USER_METATYPE(QMailAccountId); @@ -190,8 +190,8 @@ Q_DECLARE_USER_METATYPE_TYPEDEF(QMailAccountIdList, QMailAccountIdList) Q_DECLARE_USER_METATYPE_TYPEDEF(QMailFolderIdList, QMailFolderIdList) Q_DECLARE_USER_METATYPE_TYPEDEF(QMailMessageIdList, QMailMessageIdList) -uint QTOPIAMAIL_EXPORT qHash(const QMailAccountId &id); -uint QTOPIAMAIL_EXPORT qHash(const QMailFolderId &id); -uint QTOPIAMAIL_EXPORT qHash(const QMailMessageId &id); +uint QMF_EXPORT qHash(const QMailAccountId &id); +uint QMF_EXPORT qHash(const QMailFolderId &id); +uint QMF_EXPORT qHash(const QMailMessageId &id); #endif diff --git a/src/libraries/qmf/qmailmessage.cpp b/src/libraries/qmf/qmailmessage.cpp index 2ecc5d95..e1c3c55a 100644 --- a/src/libraries/qmf/qmailmessage.cpp +++ b/src/libraries/qmf/qmailmessage.cpp @@ -73,7 +73,7 @@ static const QByteArray internalPrefix() { - static const QByteArray prefix("X-qtopiamail-internal-"); + static const QByteArray prefix("X-qmf-internal-"); return prefix; } @@ -5410,7 +5410,7 @@ void QMailMessageMetaDataPrivate::deserialize(Stream &stream) \class QMailMessageMetaData \preliminary - \brief The QMailMessageMetaData class provides information about a message stored by Qtopia. + \brief The QMailMessageMetaData class provides information about a message stored by QMF. \ingroup messaginglibrary @@ -5830,7 +5830,7 @@ QMailMessageId QMailMessageMetaData::id() const /*! Sets the QMailMessageId of the message to \a id. - \a id should be different for each message known to Qtopia. + \a id should be different for each message known to QMF. */ void QMailMessageMetaData::setId(const QMailMessageId &id) { @@ -6482,7 +6482,7 @@ static int randomNumber() static QByteArray gBoundaryString; -void QTOPIAMAIL_EXPORT setQMailMessageBoundaryString(const QByteArray &boundary) +void QMF_EXPORT setQMailMessageBoundaryString(const QByteArray &boundary) { gBoundaryString = boundary; } @@ -6496,7 +6496,7 @@ static QByteArray boundaryString(const QByteArray &hash) return gBoundaryString; // Formulate a boundary that is very unlikely to clash with the content - return boundaryLeader + "qtopiamail:" + QByteArray::number(randomNumber()) + hash.toBase64() + boundaryTrailer; + return boundaryLeader + "qmf:" + QByteArray::number(randomNumber()) + hash.toBase64() + boundaryTrailer; } template <typename F> diff --git a/src/libraries/qmf/qmailmessage.h b/src/libraries/qmf/qmailmessage.h index 07906288..e89c69fd 100644 --- a/src/libraries/qmf/qmailmessage.h +++ b/src/libraries/qmf/qmailmessage.h @@ -67,7 +67,7 @@ QT_END_NAMESPACE; class QMailMessageHeaderFieldPrivate; -class QTOPIAMAIL_EXPORT QMailMessageHeaderField : public QPrivatelyImplemented<QMailMessageHeaderFieldPrivate>, public QMailMessageHeaderFieldFwd +class QMF_EXPORT QMailMessageHeaderField : public QPrivatelyImplemented<QMailMessageHeaderFieldPrivate>, public QMailMessageHeaderFieldFwd { public: typedef QMailMessageHeaderFieldPrivate ImplementationType; @@ -132,7 +132,7 @@ template <typename Stream> Stream& operator>>(Stream &stream, QMailMessageHeaderField& field) { field.deserialize(stream); return stream; } -class QTOPIAMAIL_EXPORT QMailMessageContentType : public QMailMessageHeaderField +class QMF_EXPORT QMailMessageContentType : public QMailMessageHeaderField { public: QMailMessageContentType(); @@ -160,7 +160,7 @@ private: }; -class QTOPIAMAIL_EXPORT QMailMessageContentDisposition : public QMailMessageHeaderField, public QMailMessageContentDispositionFwd +class QMF_EXPORT QMailMessageContentDisposition : public QMailMessageHeaderField, public QMailMessageContentDispositionFwd { public: QMailMessageContentDisposition(); @@ -234,7 +234,7 @@ Stream& operator>>(Stream &stream, QMailMessageHeader& header) { header.deserial class QMailMessageBodyPrivate; class LongString; -class QTOPIAMAIL_EXPORT QMailMessageBody : public QPrivatelyImplemented<QMailMessageBodyPrivate>, public QMailMessageBodyFwd +class QMF_EXPORT QMailMessageBody : public QPrivatelyImplemented<QMailMessageBodyPrivate>, public QMailMessageBodyFwd { public: typedef QMailMessageBodyPrivate ImplementationType; @@ -284,7 +284,7 @@ Stream& operator<<(Stream &stream, const QMailMessageBody& body) { body.serializ template <typename Stream> Stream& operator>>(Stream &stream, QMailMessageBody& body) { body.deserialize(stream); return stream; } -class QTOPIAMAIL_EXPORT QMailMessagePartContainer : public QPrivatelyImplemented<QMailMessagePartContainerPrivate>, public QMailMessagePartContainerFwd +class QMF_EXPORT QMailMessagePartContainer : public QPrivatelyImplemented<QMailMessagePartContainerPrivate>, public QMailMessagePartContainerFwd { public: typedef QMailMessagePartContainerPrivate ImplementationType; @@ -364,14 +364,14 @@ private: class QMailMessagePartPrivate; -class QTOPIAMAIL_EXPORT QMailMessagePart : public QMailMessagePartContainer, public QMailMessagePartFwd +class QMF_EXPORT QMailMessagePart : public QMailMessagePartContainer, public QMailMessagePartFwd { public: typedef QMailMessagePartPrivate ImplementationType; class LocationPrivate; - class QTOPIAMAIL_EXPORT Location + class QMF_EXPORT Location { public: Location(); @@ -523,7 +523,7 @@ bool QMailMessagePartContainer::foreachPart(F func) const class QMailMessageMetaDataPrivate; -class QTOPIAMAIL_EXPORT QMailMessageMetaData : public QPrivatelyImplemented<QMailMessageMetaDataPrivate>, public QMailMessageMetaDataFwd +class QMF_EXPORT QMailMessageMetaData : public QPrivatelyImplemented<QMailMessageMetaDataPrivate>, public QMailMessageMetaDataFwd { public: typedef QMailMessageMetaDataPrivate ImplementationType; @@ -677,7 +677,7 @@ public: class QMailMessagePrivate; -class QTOPIAMAIL_EXPORT QMailMessage : public QMailMessageMetaData, public QMailMessagePartContainer, public QMailMessageFwd +class QMF_EXPORT QMailMessage : public QMailMessageMetaData, public QMailMessagePartContainer, public QMailMessageFwd { public: using QMailMessageMetaData::MessageType; diff --git a/src/libraries/qmf/qmailmessagefwd.h b/src/libraries/qmf/qmailmessagefwd.h index 1aba5c4f..80d97e5d 100644 --- a/src/libraries/qmf/qmailmessagefwd.h +++ b/src/libraries/qmf/qmailmessagefwd.h @@ -47,7 +47,7 @@ class QMailMessageHeaderField; -class QTOPIAMAIL_EXPORT QMailMessageHeaderFieldFwd +class QMF_EXPORT QMailMessageHeaderFieldFwd { public: enum FieldType @@ -59,7 +59,7 @@ public: class QMailMessageContentDisposition; -class QTOPIAMAIL_EXPORT QMailMessageContentDispositionFwd +class QMF_EXPORT QMailMessageContentDispositionFwd { public: enum DispositionType @@ -72,7 +72,7 @@ public: class QMailMessageBody; -class QTOPIAMAIL_EXPORT QMailMessageBodyFwd +class QMF_EXPORT QMailMessageBodyFwd { public: enum TransferEncoding @@ -100,7 +100,7 @@ public: class QMailMessagePartContainer; -class QTOPIAMAIL_EXPORT QMailMessagePartContainerFwd +class QMF_EXPORT QMailMessagePartContainerFwd { public: enum MultipartType @@ -120,7 +120,7 @@ public: class QMailMessagePart; -class QTOPIAMAIL_EXPORT QMailMessagePartFwd +class QMF_EXPORT QMailMessagePartFwd { public: enum ReferenceType { @@ -132,7 +132,7 @@ public: class QMailMessageMetaData; -class QTOPIAMAIL_EXPORT QMailMessageMetaDataFwd +class QMF_EXPORT QMailMessageMetaDataFwd { public: enum MessageType @@ -180,7 +180,7 @@ public: class QMailMessage; -class QTOPIAMAIL_EXPORT QMailMessageFwd +class QMF_EXPORT QMailMessageFwd { public: enum AttachmentsAction { diff --git a/src/libraries/qmf/qmailmessagekey.cpp b/src/libraries/qmf/qmailmessagekey.cpp index a00bb3ef..8e2d03b1 100644 --- a/src/libraries/qmf/qmailmessagekey.cpp +++ b/src/libraries/qmf/qmailmessagekey.cpp @@ -1033,8 +1033,8 @@ QMailMessageKey QMailMessageKey::rfcId(const QString &value, QMailDataComparator } //create implementations for QDataStream -template void QTOPIAMAIL_EXPORT QMailMessageKey::serialize<QDataStream>(QDataStream& stream) const; -template void QTOPIAMAIL_EXPORT QMailMessageKey::deserialize<QDataStream>(QDataStream& stream); +template void QMF_EXPORT QMailMessageKey::serialize<QDataStream>(QDataStream& stream) const; +template void QMF_EXPORT QMailMessageKey::deserialize<QDataStream>(QDataStream& stream); Q_IMPLEMENT_USER_METATYPE(QMailMessageKey); diff --git a/src/libraries/qmf/qmailmessagekey.h b/src/libraries/qmf/qmailmessagekey.h index 54429e1e..5c5df555 100644 --- a/src/libraries/qmf/qmailmessagekey.h +++ b/src/libraries/qmf/qmailmessagekey.h @@ -62,7 +62,7 @@ template <typename Key> class MailKeyImpl; -class QTOPIAMAIL_EXPORT QMailMessageKey +class QMF_EXPORT QMailMessageKey { public: enum Property diff --git a/src/libraries/qmf/qmailmessagelistmodel.h b/src/libraries/qmf/qmailmessagelistmodel.h index 0298ae12..cc13cf84 100644 --- a/src/libraries/qmf/qmailmessagelistmodel.h +++ b/src/libraries/qmf/qmailmessagelistmodel.h @@ -47,7 +47,7 @@ class QMailMessageListModelPrivate; -class QTOPIAMAIL_EXPORT QMailMessageListModel : public QMailMessageModelBase +class QMF_EXPORT QMailMessageListModel : public QMailMessageModelBase { Q_OBJECT diff --git a/src/libraries/qmf/qmailmessagemodelbase.h b/src/libraries/qmf/qmailmessagemodelbase.h index 3cd04247..fdabf530 100644 --- a/src/libraries/qmf/qmailmessagemodelbase.h +++ b/src/libraries/qmf/qmailmessagemodelbase.h @@ -81,7 +81,7 @@ public: }; -class QTOPIAMAIL_EXPORT QMailMessageModelBase : public QAbstractItemModel +class QMF_EXPORT QMailMessageModelBase : public QAbstractItemModel { Q_OBJECT diff --git a/src/libraries/qmf/qmailmessageremovalrecord.h b/src/libraries/qmf/qmailmessageremovalrecord.h index 3cc85068..6b9d9b98 100644 --- a/src/libraries/qmf/qmailmessageremovalrecord.h +++ b/src/libraries/qmf/qmailmessageremovalrecord.h @@ -49,7 +49,7 @@ class QMailMessageRemovalRecordPrivate; -class QTOPIAMAIL_EXPORT QMailMessageRemovalRecord +class QMF_EXPORT QMailMessageRemovalRecord { public: QMailMessageRemovalRecord(); diff --git a/src/libraries/qmf/qmailmessageserver.cpp b/src/libraries/qmf/qmailmessageserver.cpp index 7056e7b3..da11ec23 100644 --- a/src/libraries/qmf/qmailmessageserver.cpp +++ b/src/libraries/qmf/qmailmessageserver.cpp @@ -50,7 +50,7 @@ static bool connectIpc( QObject *sender, const QByteArray& signal, return QCopAdaptor::connect(sender,signal,receiver,member); } -class QTOPIAMAIL_EXPORT QMailMessageServerPrivate : public QObject +class QMF_EXPORT QMailMessageServerPrivate : public QObject { Q_OBJECT diff --git a/src/libraries/qmf/qmailmessageserver.h b/src/libraries/qmf/qmailmessageserver.h index b36cf098..35c928f8 100644 --- a/src/libraries/qmf/qmailmessageserver.h +++ b/src/libraries/qmf/qmailmessageserver.h @@ -59,7 +59,7 @@ class QMailMessageServerPrivate; typedef QMap<QMailMessage::MessageType, int> QMailMessageCountMap; -class QTOPIAMAIL_EXPORT QMailMessageServer : public QObject +class QMF_EXPORT QMailMessageServer : public QObject { Q_OBJECT diff --git a/src/libraries/qmf/qmailmessageset.h b/src/libraries/qmf/qmailmessageset.h index 48952c0b..b4bba939 100644 --- a/src/libraries/qmf/qmailmessageset.h +++ b/src/libraries/qmf/qmailmessageset.h @@ -59,7 +59,7 @@ class QMailStore; class QMailMessageSetContainerPrivate; -class QTOPIAMAIL_EXPORT QMailMessageSetContainer : public QPrivatelyNoncopyable<QMailMessageSetContainerPrivate> +class QMF_EXPORT QMailMessageSetContainer : public QPrivatelyNoncopyable<QMailMessageSetContainerPrivate> { public: typedef QMailMessageSetContainerPrivate ImplementationType; @@ -96,7 +96,7 @@ private: class QMailMessageSetPrivate; -class QTOPIAMAIL_EXPORT QMailMessageSet : public QObject, public QMailMessageSetContainer +class QMF_EXPORT QMailMessageSet : public QObject, public QMailMessageSetContainer { Q_OBJECT @@ -130,7 +130,7 @@ protected: class QMailFolderMessageSetPrivate; -class QTOPIAMAIL_EXPORT QMailFolderMessageSet : public QMailMessageSet +class QMF_EXPORT QMailFolderMessageSet : public QMailMessageSet { Q_OBJECT @@ -167,7 +167,7 @@ protected: class QMailAccountMessageSetPrivate; -class QTOPIAMAIL_EXPORT QMailAccountMessageSet : public QMailMessageSet +class QMF_EXPORT QMailAccountMessageSet : public QMailMessageSet { Q_OBJECT @@ -205,7 +205,7 @@ protected: class QMailFilterMessageSetPrivate; -class QTOPIAMAIL_EXPORT QMailFilterMessageSet : public QMailMessageSet +class QMF_EXPORT QMailFilterMessageSet : public QMailMessageSet { Q_OBJECT @@ -238,7 +238,7 @@ protected: class QMailMessageSetModelPrivate; -class QTOPIAMAIL_EXPORT QMailMessageSetModel : public QAbstractItemModel, public QMailMessageSetContainer +class QMF_EXPORT QMailMessageSetModel : public QAbstractItemModel, public QMailMessageSetContainer { Q_OBJECT diff --git a/src/libraries/qmf/qmailmessagesortkey.h b/src/libraries/qmf/qmailmessagesortkey.h index 105e7888..d1b54099 100644 --- a/src/libraries/qmf/qmailmessagesortkey.h +++ b/src/libraries/qmf/qmailmessagesortkey.h @@ -50,7 +50,7 @@ class QMailMessageSortKeyPrivate; -class QTOPIAMAIL_EXPORT QMailMessageSortKey +class QMF_EXPORT QMailMessageSortKey { public: enum Property diff --git a/src/libraries/qmf/qmailmessagethreadedmodel.h b/src/libraries/qmf/qmailmessagethreadedmodel.h index d789592b..2e889434 100644 --- a/src/libraries/qmf/qmailmessagethreadedmodel.h +++ b/src/libraries/qmf/qmailmessagethreadedmodel.h @@ -47,7 +47,7 @@ class QMailMessageThreadedModelPrivate; -class QTOPIAMAIL_EXPORT QMailMessageThreadedModel : public QMailMessageModelBase +class QMF_EXPORT QMailMessageThreadedModel : public QMailMessageModelBase { Q_OBJECT diff --git a/src/libraries/qmf/qmailserviceaction.h b/src/libraries/qmf/qmailserviceaction.h index 473c2394..0d361ec7 100644 --- a/src/libraries/qmf/qmailserviceaction.h +++ b/src/libraries/qmf/qmailserviceaction.h @@ -54,7 +54,7 @@ class QMailServiceActionPrivate; -class QTOPIAMAIL_EXPORT QMailServiceAction +class QMF_EXPORT QMailServiceAction : public QObject, public QPrivatelyNoncopyable<QMailServiceActionPrivate> { @@ -82,7 +82,7 @@ public: Failed }; - class QTOPIAMAIL_EXPORT Status + class QMF_EXPORT Status { public: enum ErrorCode { @@ -156,7 +156,7 @@ protected: class QMailRetrievalActionPrivate; -class QTOPIAMAIL_EXPORT QMailRetrievalAction : public QMailServiceAction +class QMF_EXPORT QMailRetrievalAction : public QMailServiceAction { Q_OBJECT @@ -192,7 +192,7 @@ public slots: class QMailTransmitActionPrivate; -class QTOPIAMAIL_EXPORT QMailTransmitAction : public QMailServiceAction +class QMF_EXPORT QMailTransmitAction : public QMailServiceAction { Q_OBJECT @@ -214,7 +214,7 @@ public slots: class QMailStorageActionPrivate; -class QTOPIAMAIL_EXPORT QMailStorageAction : public QMailServiceAction +class QMF_EXPORT QMailStorageAction : public QMailServiceAction { Q_OBJECT @@ -241,7 +241,7 @@ public slots: class QMailSearchActionPrivate; -class QTOPIAMAIL_EXPORT QMailSearchAction : public QMailServiceAction +class QMF_EXPORT QMailSearchAction : public QMailServiceAction { Q_OBJECT @@ -269,7 +269,7 @@ public slots: class QMailActionInfoPrivate; -class QTOPIAMAIL_EXPORT QMailActionInfo : public QMailServiceAction { +class QMF_EXPORT QMailActionInfo : public QMailServiceAction { Q_OBJECT // If needed properties can be enabled by uncommenting this code // and won't break api/abi @@ -315,7 +315,7 @@ protected: class QMailActionObserverPrivate; -class QTOPIAMAIL_EXPORT QMailActionObserver : public QMailServiceAction +class QMF_EXPORT QMailActionObserver : public QMailServiceAction { Q_OBJECT // Q_PROPERTY(QList< QSharedPointer<QMailActionInfo> > actions READ actions NOTIFY actionsChanged) @@ -332,7 +332,7 @@ signals: class QMailProtocolActionPrivate; -class QTOPIAMAIL_EXPORT QMailProtocolAction : public QMailServiceAction +class QMF_EXPORT QMailProtocolAction : public QMailServiceAction { Q_OBJECT diff --git a/src/libraries/qmf/qmailstore.h b/src/libraries/qmf/qmailstore.h index 0f76b35e..d369cbed 100644 --- a/src/libraries/qmf/qmailstore.h +++ b/src/libraries/qmf/qmailstore.h @@ -62,7 +62,7 @@ class QMailStoreImplementation; static QMailStore* QMailStoreInstance(); #endif -class QTOPIAMAIL_EXPORT QMailStore : public QObject +class QMF_EXPORT QMailStore : public QObject { Q_OBJECT diff --git a/src/libraries/qmf/qmailstore_p.cpp b/src/libraries/qmf/qmailstore_p.cpp index 0aa9c148..bb1ff974 100644 --- a/src/libraries/qmf/qmailstore_p.cpp +++ b/src/libraries/qmf/qmailstore_p.cpp @@ -2192,8 +2192,8 @@ bool QMailStorePrivate::initStore() << tableInfo("mailfolders", 105) << tableInfo("mailfoldercustom", 100) << tableInfo("mailfolderlinks", 100) - << tableInfo("mailmessages", 110) - << tableInfo("mailmessagecustom", 100) + << tableInfo("mailmessages", 111) + << tableInfo("mailmessagecustom", 101) << tableInfo("mailstatusflags", 101) << tableInfo("mailmessageidentifiers", 101) << tableInfo("mailsubjects", 100) @@ -2514,7 +2514,7 @@ QString numericPtrValue<false>(const void *ptr) QString QMailStorePrivate::temporaryTableName(const QMailMessageKey::ArgumentType& arg) { const QMailMessageKey::ArgumentType *ptr = &arg; - return QString("qtopiamail_idmatch_%1").arg(numericPtrValue<(sizeof(void*) > sizeof(unsigned long))>(ptr)); + return QString("qmf_idmatch_%1").arg(numericPtrValue<(sizeof(void*) > sizeof(unsigned long))>(ptr)); } void QMailStorePrivate::createTemporaryTable(const QMailMessageKey::ArgumentType& arg, const QString &dataType) const @@ -3191,7 +3191,7 @@ qint64 QMailStorePrivate::incrementTableVersion(const QString &name, qint64 curr qint64 next = current + 1; QString versionInfo("-" + QString::number(current) + "-" + QString::number(next)); - QString scriptName(":/QtopiaSql/" + database.driverName() + '/' + name + versionInfo); + QString scriptName(":/QmfSql/" + database.driverName() + '/' + name + versionInfo); QFile data(scriptName); if (!data.open(QIODevice::ReadOnly)) { @@ -3227,7 +3227,7 @@ bool QMailStorePrivate::createTable(const QString &name) bool result = true; // load schema. - QFile data(":/QtopiaSql/" + database.driverName() + '/' + name); + QFile data(":/QmfSql/" + database.driverName() + '/' + name); if (!data.open(QIODevice::ReadOnly)) { qWarning() << "Failed to load table schema resource:" << name; result = false; @@ -4474,13 +4474,13 @@ struct ReferenceStorer QString loc(part.location().toString(false)); // Store the reference location into the message - QString key("qtopiamail-reference-location-" + loc); + QString key("qmf-reference-location-" + loc); if (message->customField(key) != value) { message->setCustomField(key, value); } // Store the reference resolution into the message - key = "qtopiamail-reference-resolution-" + loc; + key = "qmf-reference-resolution-" + loc; value = part.referenceResolution(); if (message->customField(key) != value) { message->setCustomField(key, value); diff --git a/src/libraries/qmf/qmailstoreimplementation_p.cpp b/src/libraries/qmf/qmailstoreimplementation_p.cpp index 57568974..31942328 100644 --- a/src/libraries/qmf/qmailstoreimplementation_p.cpp +++ b/src/libraries/qmf/qmailstoreimplementation_p.cpp @@ -90,14 +90,14 @@ void emitIpcUpdates(const IDListType& ids, const QString& sig, int max = QMailSt foreach (const Segment& segment, segmentList) { IDListType idSegment = ids.mid(segment.first, (segment.second - segment.first)); - QCopAdaptor a("QPE/Qtopiamail"); + QCopAdaptor a("QPE/qmf"); QCopAdaptorEnvelope e = a.send(sig.toLatin1()); e << pid; e << idSegment; } } else { - QCopAdaptor a("QPE/Qtopiamail"); + QCopAdaptor a("QPE/qmf"); QCopAdaptorEnvelope e = a.send(sig.toLatin1()); e << pid; e << ids; @@ -131,7 +131,7 @@ QMailStoreImplementationBase::QMailStoreImplementationBase(QMailStore* parent) { Q_ASSERT(q); - QCopChannel* ipcChannel = new QCopChannel("QPE/Qtopiamail", this); + QCopChannel* ipcChannel = new QCopChannel("QPE/qmf", this); connect(ipcChannel, SIGNAL(received(QString,QByteArray)), @@ -202,7 +202,7 @@ void QMailStoreImplementationBase::flushIpcNotifications() flushNotifications(); // Tell the recipients to process the notifications synchronously - QCopAdaptor a("QPE/Qtopiamail"); + QCopAdaptor a("QPE/qmf"); QCopAdaptorEnvelope e = a.send("forceIpcFlush"); e << pid; diff --git a/src/libraries/qmf/qmailtimestamp.h b/src/libraries/qmf/qmailtimestamp.h index 2390ec96..7eb39e06 100644 --- a/src/libraries/qmf/qmailtimestamp.h +++ b/src/libraries/qmf/qmailtimestamp.h @@ -50,7 +50,7 @@ class QMailTimeStampPrivate; -class QTOPIAMAIL_EXPORT QMailTimeStamp +class QMF_EXPORT QMailTimeStamp { public: enum OutputFormat { diff --git a/src/libraries/qmf/qmf.pro b/src/libraries/qmf/qmf.pro index 4e0a4f49..39d3d3a7 100644 --- a/src/libraries/qmf/qmf.pro +++ b/src/libraries/qmf/qmf.pro @@ -1,10 +1,10 @@ TEMPLATE = lib CONFIG += warn_on -TARGET = qtopiamail +TARGET = qmf target.path += $$QMF_INSTALL_ROOT/lib -DEFINES += QT_BUILD_QCOP_LIB QTOPIAMAIL_INTERNAL +DEFINES += QT_BUILD_QCOP_LIB QMF_INTERNAL win32: { # QLocalSocket is broken on win32 prior to 4.5.2 lessThan(QT_MAJOR_VERSION,5):lessThan(QT_MINOR_VERSION,6):lessThan(QT_PATCH_VERSION,2):DEFINES += QT_NO_QCOP_LOCAL_SOCKET @@ -137,9 +137,9 @@ win32: { SOURCES += locks.cpp } -RESOURCES += qtopiamail.qrc \ - qtopiamail_icons.qrc \ - qtopiamail_qt.qrc +RESOURCES += qmf.qrc \ + qmf_icons.qrc \ + qmf_qt.qrc TRANSLATIONS += libqtopiamail-ar.ts \ libqtopiamail-de.ts \ @@ -155,7 +155,7 @@ TRANSLATIONS += libqtopiamail-ar.ts \ libqtopiamail-zh_CN.ts \ libqtopiamail-zh_TW.ts -header_files.path=$$QMF_INSTALL_ROOT/include/qtopiamail +header_files.path=$$QMF_INSTALL_ROOT/include/qmf header_files.files=$$PUBLIC_HEADERS INSTALLS += header_files diff --git a/src/libraries/qmf/qmf.qrc b/src/libraries/qmf/qmf.qrc index f4793188..6b8a1fcf 100644 --- a/src/libraries/qmf/qmf.qrc +++ b/src/libraries/qmf/qmf.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/QtopiaSql/QSQLITE"> + <qresource prefix="/QmfSql/QSQLITE"> <file alias="mailaccounts">resources/mailaccounts.sqlite.sql</file> <file alias="mailaccounts-100-101">resources/mailaccounts-100-101.sqlite.sql</file> <file alias="mailaccounts-101-102">resources/mailaccounts-101-102.sqlite.sql</file> @@ -27,7 +27,9 @@ <file alias="mailmessages-107-108">resources/mailmessages-107-108.sqlite.sql</file> <file alias="mailmessages-108-109">resources/mailmessages-108-109.sqlite.sql</file> <file alias="mailmessages-109-110">resources/mailmessages-109-110.sqlite.sql</file> + <file alias="mailmessages-110-111">resources/mailmessages-110-111.sqlite.sql</file> <file alias="mailmessagecustom">resources/mailmessagecustom.sqlite.sql</file> + <file alias="mailmessagecustom-100-101">resources/mailmessages-100-101.sqlite.sql</file> <file alias="deletedmessages">resources/deletedmessages.sqlite.sql</file> <file alias="deletedmessages-100-101">resources/deletedmessages-100-101.sqlite.sql</file> <file alias="mailstatusflags">resources/mailstatusflags.sqlite.sql</file> diff --git a/src/libraries/qmf/qprivateimplementation.h b/src/libraries/qmf/qprivateimplementation.h index 2f141cf8..9e7890fb 100644 --- a/src/libraries/qmf/qprivateimplementation.h +++ b/src/libraries/qmf/qprivateimplementation.h @@ -248,14 +248,14 @@ public: }; template<typename ImplementationType> -class QTOPIAMAIL_EXPORT QPrivatelyImplemented +class QMF_EXPORT QPrivatelyImplemented { public: QPrivatelyImplemented(ImplementationType* p); QPrivatelyImplemented(const QPrivatelyImplemented& other); template<typename A1> - QTOPIAMAIL_EXPORT QPrivatelyImplemented(ImplementationType* p, A1 a1); + QMF_EXPORT QPrivatelyImplemented(ImplementationType* p, A1 a1); virtual ~QPrivatelyImplemented(); @@ -373,13 +373,13 @@ public: }; template<typename ImplementationType> -class QTOPIAMAIL_EXPORT QPrivatelyNoncopyable +class QMF_EXPORT QPrivatelyNoncopyable { public: QPrivatelyNoncopyable(ImplementationType* p); template<typename A1> - QTOPIAMAIL_EXPORT QPrivatelyNoncopyable(ImplementationType* p, A1 a1); + QMF_EXPORT QPrivatelyNoncopyable(ImplementationType* p, A1 a1); virtual ~QPrivatelyNoncopyable(); diff --git a/src/libraries/qmf/qprivateimplementationdef.h b/src/libraries/qmf/qprivateimplementationdef.h index 164fee7b..6c36d038 100644 --- a/src/libraries/qmf/qprivateimplementationdef.h +++ b/src/libraries/qmf/qprivateimplementationdef.h @@ -72,31 +72,31 @@ void QPrivateImplementationPointer<T>::decrement(T*& p) } template<typename ImplementationType> -QTOPIAMAIL_EXPORT QPrivatelyImplemented<ImplementationType>::QPrivatelyImplemented(ImplementationType* p) +QMF_EXPORT QPrivatelyImplemented<ImplementationType>::QPrivatelyImplemented(ImplementationType* p) : d(p) { } template<typename ImplementationType> -QTOPIAMAIL_EXPORT QPrivatelyImplemented<ImplementationType>::QPrivatelyImplemented(const QPrivatelyImplemented& other) +QMF_EXPORT QPrivatelyImplemented<ImplementationType>::QPrivatelyImplemented(const QPrivatelyImplemented& other) : d(other.d) { } template<typename ImplementationType> template<typename A1> -QTOPIAMAIL_EXPORT QPrivatelyImplemented<ImplementationType>::QPrivatelyImplemented(ImplementationType* p, A1 a1) +QMF_EXPORT QPrivatelyImplemented<ImplementationType>::QPrivatelyImplemented(ImplementationType* p, A1 a1) : d(p, a1) { } template<typename ImplementationType> -QTOPIAMAIL_EXPORT QPrivatelyImplemented<ImplementationType>::~QPrivatelyImplemented() +QMF_EXPORT QPrivatelyImplemented<ImplementationType>::~QPrivatelyImplemented() { } template<typename ImplementationType> -QTOPIAMAIL_EXPORT const QPrivatelyImplemented<ImplementationType>& QPrivatelyImplemented<ImplementationType>::operator=(const QPrivatelyImplemented<ImplementationType>& other) +QMF_EXPORT const QPrivatelyImplemented<ImplementationType>& QPrivatelyImplemented<ImplementationType>::operator=(const QPrivatelyImplemented<ImplementationType>& other) { d = other.d; return *this; @@ -110,20 +110,20 @@ QPrivateNoncopyablePointer<T>::~QPrivateNoncopyablePointer() } template<typename ImplementationType> -QTOPIAMAIL_EXPORT QPrivatelyNoncopyable<ImplementationType>::QPrivatelyNoncopyable(ImplementationType* p) +QMF_EXPORT QPrivatelyNoncopyable<ImplementationType>::QPrivatelyNoncopyable(ImplementationType* p) : d(p) { } template<typename ImplementationType> template<typename A1> -QTOPIAMAIL_EXPORT QPrivatelyNoncopyable<ImplementationType>::QPrivatelyNoncopyable(ImplementationType* p, A1 a1) +QMF_EXPORT QPrivatelyNoncopyable<ImplementationType>::QPrivatelyNoncopyable(ImplementationType* p, A1 a1) : d(p, a1) { } template<typename ImplementationType> -QTOPIAMAIL_EXPORT QPrivatelyNoncopyable<ImplementationType>::~QPrivatelyNoncopyable() +QMF_EXPORT QPrivatelyNoncopyable<ImplementationType>::~QPrivatelyNoncopyable() { } diff --git a/src/libraries/qmf/resources/mailmessagecsustom-100-101.sqlite.sql b/src/libraries/qmf/resources/mailmessagecsustom-100-101.sqlite.sql new file mode 100644 index 00000000..adf89fba --- /dev/null +++ b/src/libraries/qmf/resources/mailmessagecsustom-100-101.sqlite.sql @@ -0,0 +1,2 @@ +UPDATE mailmessagecustom +SET name = replace(name, 'qtopiamail-content-size', 'qmf-content-size'); diff --git a/src/libraries/qmf/resources/mailmessages-110-111.sqlite.sql b/src/libraries/qmf/resources/mailmessages-110-111.sqlite.sql new file mode 100644 index 00000000..06fdfb32 --- /dev/null +++ b/src/libraries/qmf/resources/mailmessages-110-111.sqlite.sql @@ -0,0 +1,2 @@ +UPDATE mailmessages +SET mailfile = REPLACE(mailfile, 'qtopiamailfile:', 'qmfstoragemanager:'); diff --git a/src/libraries/qmf/support/qmailglobal.h b/src/libraries/qmf/support/qmailglobal.h index 04d6d4cc..f5364ead 100644 --- a/src/libraries/qmf/support/qmailglobal.h +++ b/src/libraries/qmf/support/qmailglobal.h @@ -64,10 +64,10 @@ #endif #endif -#ifdef QTOPIAMAIL_INTERNAL -#define QTOPIAMAIL_EXPORT QMF_DECL_EXPORT +#ifdef QMF_INTERNAL +#define QMF_EXPORT QMF_DECL_EXPORT #else -#define QTOPIAMAIL_EXPORT QMF_DECL_IMPORT +#define QMF_EXPORT QMF_DECL_IMPORT #endif #ifdef QMFUTIL_INTERNAL diff --git a/src/libraries/qmf/support/qmailipc.h b/src/libraries/qmf/support/qmailipc.h index 6e63816f..39d00634 100644 --- a/src/libraries/qmf/support/qmailipc.h +++ b/src/libraries/qmf/support/qmailipc.h @@ -78,8 +78,8 @@ struct QMetaTypeRegister #define Q_DECLARE_USER_METATYPE(TYPE) \ Q_DECLARE_USER_METATYPE_NO_OPERATORS(TYPE) \ - QTOPIAMAIL_EXPORT QDataStream &operator<<(QDataStream &stream, const TYPE &var); \ - QTOPIAMAIL_EXPORT QDataStream &operator>>( QDataStream &stream, TYPE &var ); + QMF_EXPORT QDataStream &operator<<(QDataStream &stream, const TYPE &var); \ + QMF_EXPORT QDataStream &operator>>( QDataStream &stream, TYPE &var ); #define Q_DECLARE_USER_METATYPE_TYPEDEF(TAG,TYPE) \ template <typename T> \ diff --git a/src/libraries/qmf/support/qmaillog.cpp b/src/libraries/qmf/support/qmaillog.cpp index 5b689335..6d7e9b00 100644 --- a/src/libraries/qmf/support/qmaillog.cpp +++ b/src/libraries/qmf/support/qmaillog.cpp @@ -73,7 +73,7 @@ void SysLog::write(const QString& message) syslog(LOG_INFO,message.toLocal8Bit().data()); } -QTOPIAMAIL_EXPORT SysLog QLogBase::log(const char* category) +QMF_EXPORT SysLog QLogBase::log(const char* category) { SysLog r; if ( category ) @@ -83,7 +83,7 @@ QTOPIAMAIL_EXPORT SysLog QLogBase::log(const char* category) #else -QTOPIAMAIL_EXPORT QDebug QLogBase::log(const char* category) +QMF_EXPORT QDebug QLogBase::log(const char* category) { QDebug r(QtDebugMsg); if ( category ) @@ -164,7 +164,7 @@ void RuntimeLoggingManager::handleSigHup() Q_GLOBAL_STATIC(RuntimeLoggingManager, runtimeLoggingManager) // Register the flag variable so it can be reset later -QTOPIAMAIL_EXPORT void qmf_registerLoggingFlag(char *flag) +QMF_EXPORT void qmf_registerLoggingFlag(char *flag) { RuntimeLoggingManager *rlm = runtimeLoggingManager(); if (!rlm->cache.contains(flag)) @@ -172,7 +172,7 @@ QTOPIAMAIL_EXPORT void qmf_registerLoggingFlag(char *flag) } // Reset the logging flags -QTOPIAMAIL_EXPORT void qmf_resetLoggingFlags() +QMF_EXPORT void qmf_resetLoggingFlags() { RuntimeLoggingManager *rlm = runtimeLoggingManager(); @@ -206,20 +206,20 @@ QTOPIAMAIL_EXPORT void qmf_resetLoggingFlags() #define LOGGING_DEFAULT 0 #endif -QTOPIAMAIL_EXPORT bool qmf_checkLoggingEnabled(const char *category) +QMF_EXPORT bool qmf_checkLoggingEnabled(const char *category) { RuntimeLoggingManager *rlm = runtimeLoggingManager(); return rlm->settings.value(QLatin1String(category),LOGGING_DEFAULT).toBool(); } #else -QTOPIAMAIL_EXPORT void qmf_registerLoggingFlag(char *flag) +QMF_EXPORT void qmf_registerLoggingFlag(char *flag) { Q_UNUSED(flag); } -QTOPIAMAIL_EXPORT void qmf_resetLoggingFlags() { } +QMF_EXPORT void qmf_resetLoggingFlags() { } -QTOPIAMAIL_EXPORT bool qmf_checkLoggingEnabled(const char *category) +QMF_EXPORT bool qmf_checkLoggingEnabled(const char *category) { Q_UNUSED(category); return false; diff --git a/src/libraries/qmf/support/qmaillog.h b/src/libraries/qmf/support/qmaillog.h index cd625fc5..10c9d15d 100644 --- a/src/libraries/qmf/support/qmaillog.h +++ b/src/libraries/qmf/support/qmaillog.h @@ -49,7 +49,7 @@ #include <QTextStream> -class QTOPIAMAIL_EXPORT SysLog +class QMF_EXPORT SysLog { public: SysLog(); @@ -95,7 +95,7 @@ SysLog& SysLog::operator<<(const T& item) } #endif //QMAIL_SYSLOG -class QTOPIAMAIL_EXPORT QLogBase { +class QMF_EXPORT QLogBase { public: #ifdef QMAIL_SYSLOG static SysLog log(const char*); @@ -115,9 +115,9 @@ public: static inline bool enabled() { return 1; }\ }; -QTOPIAMAIL_EXPORT void qmf_registerLoggingFlag(char *flag); -QTOPIAMAIL_EXPORT void qmf_resetLoggingFlags(); -QTOPIAMAIL_EXPORT bool qmf_checkLoggingEnabled(const char *category); +QMF_EXPORT void qmf_registerLoggingFlag(char *flag); +QMF_EXPORT void qmf_resetLoggingFlags(); +QMF_EXPORT bool qmf_checkLoggingEnabled(const char *category); #define QLOG_RUNTIME(dbgcat) \ class dbgcat##_QLog : public QLogBase { \ public: \ diff --git a/src/libraries/qmf/support/qmailnamespace.cpp b/src/libraries/qmf/support/qmailnamespace.cpp index 27b0bb78..8ddb1665 100644 --- a/src/libraries/qmf/support/qmailnamespace.cpp +++ b/src/libraries/qmf/support/qmailnamespace.cpp @@ -365,7 +365,7 @@ static void loadExtensions() return; } - QFile file(":qtopiamail/mime.types"); + QFile file(":qmf/mime.types"); if ( file.open(QIODevice::ReadOnly) ) { char line[1024]; diff --git a/src/libraries/qmf/support/qmailnamespace.h b/src/libraries/qmf/support/qmailnamespace.h index 7116d65f..a37d3b76 100644 --- a/src/libraries/qmf/support/qmailnamespace.h +++ b/src/libraries/qmf/support/qmailnamespace.h @@ -58,26 +58,26 @@ QT_END_NAMESPACE; namespace QMail { - QTOPIAMAIL_EXPORT QString lastSystemErrorMessage(); - QTOPIAMAIL_EXPORT void usleep(unsigned long usecs); - QTOPIAMAIL_EXPORT QString dataPath(); - QTOPIAMAIL_EXPORT QString tempPath(); - QTOPIAMAIL_EXPORT QString pluginsPath(); - QTOPIAMAIL_EXPORT QString sslCertsPath(); - QTOPIAMAIL_EXPORT QString messageServerPath(); - QTOPIAMAIL_EXPORT QString messageSettingsPath(); - QTOPIAMAIL_EXPORT QString mimeTypeFromFileName(const QString& filename); - QTOPIAMAIL_EXPORT QStringList extensionsForMimeType(const QString& mimeType); + QMF_EXPORT QString lastSystemErrorMessage(); + QMF_EXPORT void usleep(unsigned long usecs); + QMF_EXPORT QString dataPath(); + QMF_EXPORT QString tempPath(); + QMF_EXPORT QString pluginsPath(); + QMF_EXPORT QString sslCertsPath(); + QMF_EXPORT QString messageServerPath(); + QMF_EXPORT QString messageSettingsPath(); + QMF_EXPORT QString mimeTypeFromFileName(const QString& filename); + QMF_EXPORT QStringList extensionsForMimeType(const QString& mimeType); #if !defined(Q_OS_WIN) || !defined(_WIN32_WCE) - QTOPIAMAIL_EXPORT int fileLock(const QString& filePath); - QTOPIAMAIL_EXPORT bool fileUnlock(int id); + QMF_EXPORT int fileLock(const QString& filePath); + QMF_EXPORT bool fileUnlock(int id); - QTOPIAMAIL_EXPORT QSqlDatabase createDatabase(); + QMF_EXPORT QSqlDatabase createDatabase(); #endif - QTOPIAMAIL_EXPORT QString baseSubject(const QString& subject, bool *replyOrForward); - QTOPIAMAIL_EXPORT QStringList messageIdentifiers(const QString& str); + QMF_EXPORT QString baseSubject(const QString& subject, bool *replyOrForward); + QMF_EXPORT QStringList messageIdentifiers(const QString& str); template<typename StringType> StringType unquoteString(const StringType& src) diff --git a/src/libraries/qmf/support/qmailpluginmanager.h b/src/libraries/qmf/support/qmailpluginmanager.h index cc4b9c8c..e2cae800 100644 --- a/src/libraries/qmf/support/qmailpluginmanager.h +++ b/src/libraries/qmf/support/qmailpluginmanager.h @@ -48,7 +48,7 @@ class QMailPluginManagerPrivate; -class QTOPIAMAIL_EXPORT QMailPluginManager : public QObject +class QMF_EXPORT QMailPluginManager : public QObject { Q_OBJECT diff --git a/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp b/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp index 207ce0e4..158cbe0d 100644 --- a/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp +++ b/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp @@ -58,7 +58,7 @@ Messages of type \l{QMailMessageMetaDataFwd::Email}{QMailMessage::Email} may be classified as having \l{QMailMessageMetaDataFwd::VoicemailContent}{QMailMessage::VoicemailContent} or \l{QMailMessageMetaDataFwd::VideomailContent}{QMailMessage::VideomailContent} content if their - \l{QMailMessage::from()} address matches any of those configured in the \c{Trolltech/messageserver.conf} file. + \l{QMailMessage::from()} address matches any of those configured in the \c{Nokia/messageserver.conf} file. */ /*! @@ -66,7 +66,7 @@ */ QMailMessageClassifier::QMailMessageClassifier() { - QSettings settings("Trolltech", "messageserver"); + QSettings settings("Nokia", "messageserver"); settings.beginGroup("global"); diff --git a/src/libraries/qmfmessageserver/qmailmessageservice.h b/src/libraries/qmfmessageserver/qmailmessageservice.h index 0f6db3da..46447674 100644 --- a/src/libraries/qmfmessageserver/qmailmessageservice.h +++ b/src/libraries/qmfmessageserver/qmailmessageservice.h @@ -94,7 +94,7 @@ struct MESSAGESERVER_EXPORT QMailMessageServicePluginInterface : public QFactory QT_BEGIN_NAMESPACE -#define QMailMessageServicePluginInterface_iid "com.trolltech.Qtopia.Qtopiamail.QMailMessageServicePluginInterface" +#define QMailMessageServicePluginInterface_iid "com.nokia.qmf.QMailMessageServicePluginInterface" Q_DECLARE_INTERFACE(QMailMessageServicePluginInterface, QMailMessageServicePluginInterface_iid) QT_END_NAMESPACE; diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp index 40ddef18..499f07a0 100644 --- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp +++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qtopiamailfilemanager.h" +#include "qmfstoragemanager.h" #include "qmailmessage.h" #include "qmailstore.h" #include "qmailnamespace.h" @@ -60,7 +60,7 @@ namespace { -const QString gKey("qtopiamailfile"); +const QString gKey("qmfstoragemanager"); QMap<QMailAccountId, QString> gAccountPath; @@ -109,7 +109,7 @@ QString generateUniqueFileName(const QMailAccountId &accountId, const QString &n QString path; do { - path = QtopiamailfileManager::messageFilePath(filename + randomString(5), accountId); + path = QmfStorageManager::messageFilePath(filename + randomString(5), accountId); } while (QFile::exists(path)); return path; @@ -155,7 +155,7 @@ bool migrateAccountToVersion101(const QMailAccountId &accountId) QStringList entries(path.entryList()); if (!entries.isEmpty()) { // Does the part directory exist? - QString partDirectory(QtopiamailfileManager::messagePartDirectory(fileName)); + QString partDirectory(QmfStorageManager::messagePartDirectory(fileName)); if (!QDir(partDirectory).exists()) { if (!QDir::root().mkpath(partDirectory)) { qMailLog(Messaging) << "Unable to create directory for message part content:" << partDirectory; @@ -204,7 +204,7 @@ void syncFile(QSharedPointer<QFile> file) } -QtopiamailfileManager::QtopiamailfileManager(QObject *parent) +QmfStorageManager::QmfStorageManager(QObject *parent) : QObject(parent), _useFullSync(false) { @@ -222,35 +222,35 @@ QtopiamailfileManager::QtopiamailfileManager(QObject *parent) } } -QtopiamailfileManager::~QtopiamailfileManager() +QmfStorageManager::~QmfStorageManager() { // Finalise any changes we have pending ensureDurability(); } -void QtopiamailfileManager::clearAccountPath(const QMailAccountIdList &ids) +void QmfStorageManager::clearAccountPath(const QMailAccountIdList &ids) { foreach (const QMailAccountId &id, ids) gAccountPath.remove(id); } -QMailStore::ErrorCode QtopiamailfileManager::add(QMailMessage *message, QMailContentManager::DurabilityRequirement durability) +QMailStore::ErrorCode QmfStorageManager::add(QMailMessage *message, QMailContentManager::DurabilityRequirement durability) { return addOrRename(message, QString(), (durability == QMailContentManager::EnsureDurability)); } -QMailStore::ErrorCode QtopiamailfileManager::addOrRename(QMailMessage *message, const QString &existingIdentifier, bool durable) +QMailStore::ErrorCode QmfStorageManager::addOrRename(QMailMessage *message, const QString &existingIdentifier, bool durable) { // Use the supplied identifier as a filename QString filePath = generateUniqueFileName(message->parentAccountId(), message->contentIdentifier()); message->setContentIdentifier(filePath); - QString detachedFile = message->customField("qtopiamail-detached-filename"); + QString detachedFile = message->customField("qmf-detached-filename"); if (!detachedFile.isEmpty() && (message->multipartType() == QMailMessagePartContainer::MultipartNone)) { // Try to take ownership of the file if (QFile::rename(detachedFile, filePath)) { - message->removeCustomField("qtopiamail-detached-filename"); + message->removeCustomField("qmf-detached-filename"); return QMailStore::NoError; } } @@ -288,11 +288,11 @@ QMailStore::ErrorCode QtopiamailfileManager::addOrRename(QMailMessage *message, syncLater(file); } - message->removeCustomField("qtopiamail-detached-filename"); + message->removeCustomField("qmf-detached-filename"); return QMailStore::NoError; } -QMailStore::ErrorCode QtopiamailfileManager::update(QMailMessage *message, QMailContentManager::DurabilityRequirement durability) +QMailStore::ErrorCode QmfStorageManager::update(QMailMessage *message, QMailContentManager::DurabilityRequirement durability) { QString existingIdentifier(message->contentIdentifier()); @@ -316,7 +316,7 @@ QMailStore::ErrorCode QtopiamailfileManager::update(QMailMessage *message, QMail return QMailStore::NoError; } -QMailStore::ErrorCode QtopiamailfileManager::ensureDurability() +QMailStore::ErrorCode QmfStorageManager::ensureDurability() { if (_useFullSync) { // More than one file needs to be synchronized @@ -336,7 +336,7 @@ QMailStore::ErrorCode QtopiamailfileManager::ensureDurability() return QMailStore::NoError; } -QMailStore::ErrorCode QtopiamailfileManager::remove(const QString &identifier) +QMailStore::ErrorCode QmfStorageManager::remove(const QString &identifier) { QMailStore::ErrorCode result(QMailStore::NoError); @@ -366,7 +366,7 @@ struct ReferenceLoader QString loc = part.location().toString(false); // See if this part is a reference - QString name("qtopiamail-reference-location-" + loc); + QString name("qmf-reference-location-" + loc); QString value(message->customField(name)); if (!value.isEmpty()) { // This part is a reference @@ -389,7 +389,7 @@ struct ReferenceLoader } // Is this reference resolved? - name = QString("qtopiamail-reference-resolution-" + loc); + name = QString("qmf-reference-resolution-" + loc); value = message->customField(name); if (!value.isEmpty()) { part.setReferenceResolution(value); @@ -416,7 +416,7 @@ struct PartLoader if (localAttachment) partFilePath = QUrl(part.contentLocation()).toLocalFile(); else - partFilePath = QtopiamailfileManager::messagePartFilePath(part, fileName); + partFilePath = QmfStorageManager::messagePartFilePath(part, fileName); if (QFile::exists(partFilePath)) { // Is the file content in encoded or decoded form? Since we're delivering @@ -432,7 +432,7 @@ struct PartLoader } }; -QMailStore::ErrorCode QtopiamailfileManager::load(const QString &identifier, QMailMessage *message) +QMailStore::ErrorCode QmfStorageManager::load(const QString &identifier, QMailMessage *message) { QString path(identifier); if (!QFile::exists(path)) { @@ -469,10 +469,10 @@ QMailStore::ErrorCode QtopiamailfileManager::load(const QString &identifier, QMa return QMailStore::NoError; } -bool QtopiamailfileManager::init() +bool QmfStorageManager::init() { // It used to be possible for accounts to not have a storage service configured. - // If so, add a configuration to those accounts for qtopiamailfile + // If so, add a configuration to those accounts for QmfStorageManager foreach (const QMailAccountId &accountId, QMailStore::instance()->queryAccounts()) { QMailAccountConfiguration config(accountId); @@ -542,7 +542,7 @@ bool QtopiamailfileManager::init() return true; } -void QtopiamailfileManager::clearContent() +void QmfStorageManager::clearContent() { // Delete all content files recursivelyRemovePath(messagesBodyPath(QMailAccountId())); @@ -555,7 +555,7 @@ void QtopiamailfileManager::clearContent() } } -const QString &QtopiamailfileManager::messagesBodyPath(const QMailAccountId &accountId) +const QString &QmfStorageManager::messagesBodyPath(const QMailAccountId &accountId) { static QString path(defaultPath()); @@ -582,17 +582,17 @@ const QString &QtopiamailfileManager::messagesBodyPath(const QMailAccountId &acc return path; } -QString QtopiamailfileManager::messageFilePath(const QString &fileName, const QMailAccountId &accountId) +QString QmfStorageManager::messageFilePath(const QString &fileName, const QMailAccountId &accountId) { return messagesBodyPath(accountId) + '/' + fileName; } -QString QtopiamailfileManager::messagePartFilePath(const QMailMessagePart &part, const QString &fileName) +QString QmfStorageManager::messagePartFilePath(const QMailMessagePart &part, const QString &fileName) { return messagePartDirectory(fileName) + '/' + part.location().toString(false); } -QString QtopiamailfileManager::messagePartDirectory(const QString &fileName) +QString QmfStorageManager::messagePartDirectory(const QString &fileName) { return fileName + "-parts"; } @@ -612,11 +612,11 @@ struct PartStorer (part.multipartType() == QMailMessagePartContainer::MultipartNone) && part.hasBody()) { // We need to store this part - QString partFilePath(QtopiamailfileManager::messagePartFilePath(part, fileName)); + QString partFilePath(QmfStorageManager::messagePartFilePath(part, fileName)); if (!part.contentModified() && !existing.isEmpty()) { // This part is not modified; see if we can simply move the existing file to the new identifier - QString existingPath(QtopiamailfileManager::messagePartFilePath(part, existing)); + QString existingPath(QmfStorageManager::messagePartFilePath(part, existing)); if (QFile::rename(existingPath, partFilePath)) { return true; } @@ -625,7 +625,7 @@ struct PartStorer // We can only write the content in decoded form if it is complete QMailMessageBody::EncodingFormat outputFormat(part.contentAvailable() ? QMailMessageBody::Decoded : QMailMessageBody::Encoded); - QString detachedFile = message->customField("qtopiamail-detached-filename"); + QString detachedFile = message->customField("qmf-detached-filename"); if (!detachedFile.isEmpty()) { // We can take ownership of the file if that helps if ((outputFormat == QMailMessageBody::Encoded) || @@ -634,7 +634,7 @@ struct PartStorer (part.transferEncoding() != QMailMessageBody::QuotedPrintable))) { // Try to take ownership of the file if (QFile::rename(detachedFile, partFilePath)) { - message->removeCustomField("qtopiamail-detached-filename"); + message->removeCustomField("qmf-detached-filename"); return true; } } @@ -669,7 +669,7 @@ struct PartStorer } }; -bool QtopiamailfileManager::addOrRenameParts(QMailMessage *message, const QString &fileName, const QString &existing, bool durable) +bool QmfStorageManager::addOrRenameParts(QMailMessage *message, const QString &fileName, const QString &existing, bool durable) { // Ensure that the part directory exists QString partDirectory(messagePartDirectory(fileName)); @@ -693,7 +693,7 @@ bool QtopiamailfileManager::addOrRenameParts(QMailMessage *message, const QStrin return true; } -bool QtopiamailfileManager::removeParts(const QString &fileName) +bool QmfStorageManager::removeParts(const QString &fileName) { bool result(true); @@ -720,7 +720,7 @@ bool QtopiamailfileManager::removeParts(const QString &fileName) return result; } -void QtopiamailfileManager::syncLater(QSharedPointer<QFile> file) +void QmfStorageManager::syncLater(QSharedPointer<QFile> file) { #ifdef USE_FSYNC_PER_FILE _openFiles.append(file); @@ -739,20 +739,20 @@ void QtopiamailfileManager::syncLater(QSharedPointer<QFile> file) } -Q_EXPORT_PLUGIN2(qtopiamailfilemanager,QtopiamailfileManagerPlugin) +Q_EXPORT_PLUGIN2(QmfStorageManager,QmfStorageManagerPlugin) -QtopiamailfileManagerPlugin::QtopiamailfileManagerPlugin() +QmfStorageManagerPlugin::QmfStorageManagerPlugin() : QMailContentManagerPlugin() { } -QString QtopiamailfileManagerPlugin::key() const +QString QmfStorageManagerPlugin::key() const { return gKey; } -QMailContentManager *QtopiamailfileManagerPlugin::create() +QMailContentManager *QmfStorageManagerPlugin::create() { - return new QtopiamailfileManager(this); + return new QmfStorageManager(this); } diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h index 99970776..7b803fbe 100644 --- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h +++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QTOPIAMAILFILEMANAGER_H -#define QTOPIAMAILFILEMANAGER_H +#ifndef QMFSTORAGEMANAGER_H +#define QMFSTORAGEMANAGER_H #include <qmailid.h> #include <qmailcontentmanager.h> @@ -57,13 +57,13 @@ class QFile; QT_END_NAMESPACE; -class QtopiamailfileManager : public QObject, public QMailContentManager +class QmfStorageManager : public QObject, public QMailContentManager { Q_OBJECT public: - QtopiamailfileManager(QObject *parent = 0); - ~QtopiamailfileManager(); + QmfStorageManager(QObject *parent = 0); + ~QmfStorageManager(); QMailStore::ErrorCode add(QMailMessage *message, QMailContentManager::DurabilityRequirement durability); QMailStore::ErrorCode update(QMailMessage *message, QMailContentManager::DurabilityRequirement durability); @@ -97,12 +97,12 @@ private: }; -class QtopiamailfileManagerPlugin : public QMailContentManagerPlugin +class QmfStorageManagerPlugin : public QMailContentManagerPlugin { Q_OBJECT public: - QtopiamailfileManagerPlugin(); + QmfStorageManagerPlugin(); virtual QString key() const; QMailContentManager *create(); diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro index 56738b6f..fd9126bf 100644 --- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro +++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -TARGET = qtopiamailfilemanager -CONFIG += qtopiamail plugin +TARGET = qmfstoragemanager +CONFIG += qmf plugin QT = core target.path += $$QMF_INSTALL_ROOT/plugins/contentmanagers @@ -9,14 +9,14 @@ DEFINES += PLUGIN_INTERNAL DEPENDPATH += . -INCLUDEPATH += . ../../../libraries/qtopiamail \ - ../../../libraries/qtopiamail/support +INCLUDEPATH += . ../../../libraries/qmf \ + ../../../libraries/qmf/support -LIBS += -L../../../libraries/qtopiamail/build -macx:LIBS += -F../../../libraries/qtopiamail/build +LIBS += -L../../../libraries/qmf/build +macx:LIBS += -F../../../libraries/qmf/build -HEADERS += qtopiamailfilemanager.h +HEADERS += qmfstoragemanager.h -SOURCES += qtopiamailfilemanager.cpp +SOURCES += qmfstoragemanager.cpp include(../../../../common.pri) diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro index 37878d50..9ffe9973 100644 --- a/src/plugins/messageservices/imap/imap.pro +++ b/src/plugins/messageservices/imap/imap.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = imap -CONFIG += messageserver qtopiamail plugin +CONFIG += qmfmessageserver qmf plugin target.path += $$QMF_INSTALL_ROOT/plugins/messageservices @@ -8,15 +8,15 @@ QT = core network DEPENDPATH += . -INCLUDEPATH += . ../../../libraries/qtopiamail \ - ../../../libraries/messageserver \ - ../../../libraries/qtopiamail/support +INCLUDEPATH += . ../../../libraries/qmf \ + ../../../libraries/qmfmessageserver \ + ../../../libraries/qmf/support -LIBS += -L../../../libraries/qtopiamail/build \ - -L../../../libraries/messageserver/build \ +LIBS += -L../../../libraries/qmf/build \ + -L../../../libraries/qmfmessageserver/build \ -macx:LIBS += -F../../../libraries/qtopiamail/build \ - -F../../../libraries/messageserver/build \ +macx:LIBS += -F../../../libraries/qmf/build \ + -F../../../libraries/qmfmessageserver/build \ HEADERS += imapclient.h \ diff --git a/src/plugins/messageservices/imap/imapclient.cpp b/src/plugins/messageservices/imap/imapclient.cpp index a3784517..b85e49ab 100644 --- a/src/plugins/messageservices/imap/imapclient.cpp +++ b/src/plugins/messageservices/imap/imapclient.cpp @@ -831,7 +831,7 @@ void ImapClient::messageFetched(QMailMessage& mail, const QString &detachedFilen qWarning() << "Unable to find existing message for uid:" << mail.serverUid() << "account:" << _config.id(); } } - mail.setCustomField("qtopiamail-detached-filename", detachedFilename); + mail.setCustomField("qmf-detached-filename", detachedFilename); _classifier.classifyMessage(mail); @@ -864,7 +864,7 @@ static bool updateParts(QMailMessagePart &part, const QByteArray &bodyData) if (part.multipartType() == QMailMessage::MultipartNone) { // The body data is for this part only part.setBody(QMailMessageBody::fromData(bodyData, part.contentType(), part.transferEncoding(), QMailMessageBody::AlreadyEncoded)); - part.removeHeaderField("X-qtopiamail-internal-partial-content"); + part.removeHeaderField("X-qmf-internal-partial-content"); } else { const QByteArray &boundary(part.contentType().boundary()); @@ -1131,10 +1131,10 @@ void ImapClient::dataFetched(const QString &uid, const QString §ion, const Q const int totalSize(existingSize + size); if (totalSize >= part.contentDisposition().size()) { // We have all the data for this part - part.removeHeaderField("X-qtopiamail-internal-partial-content"); + part.removeHeaderField("X-qmf-internal-partial-content"); } else { // We only have a portion of the part data - part.setHeaderField("X-qtopiamail-internal-partial-content", "true"); + part.setHeaderField("X-qmf-internal-partial-content", "true"); } } else { // Find the part bodies in the retrieved data @@ -1160,8 +1160,8 @@ void ImapClient::dataFetched(const QString &uid, const QString §ion, const Q } // These updates cannot be effected by storing the data file directly - if (!mail.customField("qtopiamail-detached-filename").isEmpty()) { - mail.removeCustomField("qtopiamail-detached-filename"); + if (!mail.customField("qmf-detached-filename").isEmpty()) { + mail.removeCustomField("qmf-detached-filename"); } } } diff --git a/src/plugins/messageservices/imap/imapstrategy.cpp b/src/plugins/messageservices/imap/imapstrategy.cpp index 67d38a91..ac360027 100644 --- a/src/plugins/messageservices/imap/imapstrategy.cpp +++ b/src/plugins/messageservices/imap/imapstrategy.cpp @@ -256,9 +256,9 @@ static bool transferMessageData(QMailMessage &message, const QMailMessage &sourc if (!transferPartBodies(message, source)) return false; - if (!message.customField("qtopiamail-detached-filename").isEmpty()) { + if (!message.customField("qmf-detached-filename").isEmpty()) { // We have modified the content, so the detached file data is no longer sufficient - message.removeCustomField("qtopiamail-detached-filename"); + message.removeCustomField("qmf-detached-filename"); } if (source.status() & QMailMessage::ContentAvailable) { diff --git a/src/plugins/messageservices/pop/pop.pro b/src/plugins/messageservices/pop/pop.pro index 9eef6557..0f8e8341 100644 --- a/src/plugins/messageservices/pop/pop.pro +++ b/src/plugins/messageservices/pop/pop.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = pop -CONFIG += qtopiamail messageserver plugin +CONFIG += qmf qmfmessageserver plugin target.path = $$QMF_INSTALL_ROOT/plugins/messageservices @@ -8,14 +8,14 @@ QT = core network DEPENDPATH += . -INCLUDEPATH += . ../../../libraries/qtopiamail \ - ../../../libraries/messageserver \ - ../../../libraries/qtopiamail/support +INCLUDEPATH += . ../../../libraries/qmf \ + ../../../libraries/qmfmessageserver \ + ../../../libraries/qmf/support -LIBS += -L../../../libraries/qtopiamail/build \ - -L../../../libraries/messageserver/build -macx:LIBS += -F../../../libraries/qtopiamail/build \ - -F../../../libraries/messageserver/build +LIBS += -L../../../libraries/qmf/build \ + -L../../../libraries/qmfmessageserver/build +macx:LIBS += -F../../../libraries/qmf/build \ + -F../../../libraries/qmfmessageserver/build HEADERS += popclient.h \ diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp index a900cbb1..787180ac 100644 --- a/src/plugins/messageservices/pop/popclient.cpp +++ b/src/plugins/messageservices/pop/popclient.cpp @@ -1001,7 +1001,7 @@ void PopClient::createMail() mail.setStatus(QMailMessage::New, true); mail.setReceivedDate(QMailTimeStamp::currentDateTime()); } - mail.setCustomField( "qtopiamail-detached-filename", detachedFile ); + mail.setCustomField( "qmf-detached-filename", detachedFile ); mail.setMessageType(QMailMessage::Email); mail.setParentAccountId(config.id()); diff --git a/src/plugins/messageservices/qmfsettings/qmfsettings.pro b/src/plugins/messageservices/qmfsettings/qmfsettings.pro index 3330e77e..d50862cd 100644 --- a/src/plugins/messageservices/qmfsettings/qmfsettings.pro +++ b/src/plugins/messageservices/qmfsettings/qmfsettings.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -TARGET = qtopiamailfile -CONFIG += qtopiamail messageserver plugin +TARGET = qmfsettings +CONFIG += qmf qmfmessageserver plugin target.path += $$QMF_INSTALL_ROOT/plugins/messageservices @@ -8,14 +8,14 @@ QT = core network DEPENDPATH += . -INCLUDEPATH += . ../../../libraries/qtopiamail \ - ../../../libraries/messageserver \ - ../../../libraries/qtopiamail/support +INCLUDEPATH += . ../../../libraries/qmf \ + ../../../libraries/qmfmessageserver \ + ../../../libraries/qmf/support -LIBS += -L../../../libraries/qtopiamail/build \ - -L../../../libraries/messageserver/build -macx:LIBS += -F../../../libraries/qtopiamail/build \ - -F../../../libraries/messageserver/build +LIBS += -L../../../libraries/qmf/build \ + -L../../../libraries/qmfmessageserver/build +macx:LIBS += -F../../../libraries/qmf/build \ + -F../../../libraries/qmfmessageserver/build HEADERS += service.h diff --git a/src/plugins/messageservices/qmfsettings/service.cpp b/src/plugins/messageservices/qmfsettings/service.cpp index 8c5abdf6..b77ee51e 100644 --- a/src/plugins/messageservices/qmfsettings/service.cpp +++ b/src/plugins/messageservices/qmfsettings/service.cpp @@ -46,14 +46,14 @@ #include <QtPlugin> #include <QCoreApplication> -namespace { const QString serviceKey("qtopiamailfile"); } +namespace { const QString serviceKey("qmfsettings"); } -class QtopiamailfileConfigurator : public QMailMessageServiceConfigurator +class QmfConfigurator : public QMailMessageServiceConfigurator { public: - QtopiamailfileConfigurator(); - ~QtopiamailfileConfigurator(); + QmfConfigurator(); + ~QmfConfigurator(); virtual QString service() const; virtual QString displayName() const; @@ -63,64 +63,64 @@ public: #endif }; -QtopiamailfileConfigurator::QtopiamailfileConfigurator() +QmfConfigurator::QmfConfigurator() { } -QtopiamailfileConfigurator::~QtopiamailfileConfigurator() +QmfConfigurator::~QmfConfigurator() { } -QString QtopiamailfileConfigurator::service() const +QString QmfConfigurator::service() const { return serviceKey; } -QString QtopiamailfileConfigurator::displayName() const +QString QmfConfigurator::displayName() const { return QCoreApplication::instance()->translate("QMailMessageService", "Mailfile"); } #ifndef QMF_NO_MESSAGE_SERVICE_EDITOR -QMailMessageServiceEditor *QtopiamailfileConfigurator::createEditor(QMailMessageServiceFactory::ServiceType type) +QMailMessageServiceEditor *QmfConfigurator::createEditor(QMailMessageServiceFactory::ServiceType type) { if (type == QMailMessageServiceFactory::Storage) - return new QtopiamailfileSettings; + return new QmfSettings; return 0; } #endif -Q_EXPORT_PLUGIN2(qtopiamailfile,QtopiamailfileServicePlugin) +Q_EXPORT_PLUGIN2(qmfsettings,QmfServicePlugin) -QtopiamailfileServicePlugin::QtopiamailfileServicePlugin() +QmfServicePlugin::QmfServicePlugin() : QMailMessageServicePlugin() { } -QString QtopiamailfileServicePlugin::key() const +QString QmfServicePlugin::key() const { return serviceKey; } -bool QtopiamailfileServicePlugin::supports(QMailMessageServiceFactory::ServiceType type) const +bool QmfServicePlugin::supports(QMailMessageServiceFactory::ServiceType type) const { return (type == QMailMessageServiceFactory::Storage); } -bool QtopiamailfileServicePlugin::supports(QMailMessage::MessageType) const +bool QmfServicePlugin::supports(QMailMessage::MessageType) const { return true; } -QMailMessageService *QtopiamailfileServicePlugin::createService(const QMailAccountId &) +QMailMessageService *QmfServicePlugin::createService(const QMailAccountId &) { return 0; } -QMailMessageServiceConfigurator *QtopiamailfileServicePlugin::createServiceConfigurator() +QMailMessageServiceConfigurator *QmfServicePlugin::createServiceConfigurator() { - return new QtopiamailfileConfigurator(); + return new QmfConfigurator(); } diff --git a/src/plugins/messageservices/qmfsettings/service.h b/src/plugins/messageservices/qmfsettings/service.h index 8d874071..8ff0bcf3 100644 --- a/src/plugins/messageservices/qmfsettings/service.h +++ b/src/plugins/messageservices/qmfsettings/service.h @@ -44,12 +44,12 @@ #include <qmailmessageservice.h> -class QtopiamailfileServicePlugin : public QMailMessageServicePlugin +class QmfServicePlugin : public QMailMessageServicePlugin { Q_OBJECT public: - QtopiamailfileServicePlugin(); + QmfServicePlugin(); virtual QString key() const; virtual bool supports(QMailMessageServiceFactory::ServiceType type) const; diff --git a/src/plugins/messageservices/qmfsettings/settings.cpp b/src/plugins/messageservices/qmfsettings/settings.cpp index fbfb7dfd..52937035 100644 --- a/src/plugins/messageservices/qmfsettings/settings.cpp +++ b/src/plugins/messageservices/qmfsettings/settings.cpp @@ -52,13 +52,13 @@ extern QList<QPair<QString, QString> > storageLocations(); namespace { -const QString serviceKey("qtopiamailfile"); +const QString serviceKey("qmfsettings"); const QList<QPair<QString, QString> > locations(storageLocations()); } -QtopiamailfileSettings::QtopiamailfileSettings() +QmfSettings::QmfSettings() : QMailMessageServiceEditor() { setupUi(this); @@ -69,7 +69,7 @@ QtopiamailfileSettings::QtopiamailfileSettings() locationSelector->addItem((*it).first); } -void QtopiamailfileSettings::displayConfiguration(const QMailAccount &, const QMailAccountConfiguration &config) +void QmfSettings::displayConfiguration(const QMailAccount &, const QMailAccountConfiguration &config) { if (!config.services().contains(serviceKey)) { // New account @@ -87,7 +87,7 @@ void QtopiamailfileSettings::displayConfiguration(const QMailAccount &, const QM } } -bool QtopiamailfileSettings::updateAccount(QMailAccount *, QMailAccountConfiguration *config) +bool QmfSettings::updateAccount(QMailAccount *, QMailAccountConfiguration *config) { if (!config->services().contains(serviceKey)) config->addServiceConfiguration(serviceKey); diff --git a/src/plugins/messageservices/qmfsettings/settings.h b/src/plugins/messageservices/qmfsettings/settings.h index 0c08afa1..c0b2658f 100644 --- a/src/plugins/messageservices/qmfsettings/settings.h +++ b/src/plugins/messageservices/qmfsettings/settings.h @@ -45,12 +45,12 @@ #include "ui_settings.h" #include <qmailmessageservice.h> -class QtopiamailfileSettings : public QMailMessageServiceEditor, private Ui::QtopiamailfileSettings +class QmfSettings : public QMailMessageServiceEditor, private Ui::QtopiamailfileSettings { Q_OBJECT public: - QtopiamailfileSettings(); + QmfSettings(); void displayConfiguration(const QMailAccount &account, const QMailAccountConfiguration &config); bool updateAccount(QMailAccount *account, QMailAccountConfiguration *config); diff --git a/src/plugins/messageservices/qmfsettings/storagelocations.cpp b/src/plugins/messageservices/qmfsettings/storagelocations.cpp index 448031d1..cb3b1db5 100644 --- a/src/plugins/messageservices/qmfsettings/storagelocations.cpp +++ b/src/plugins/messageservices/qmfsettings/storagelocations.cpp @@ -46,7 +46,7 @@ QList<QPair<QString, QString> > storageLocations() { QList<QPair<QString, QString> > locations; - locations.append(qMakePair(QString("qtopiamailfile"),QString(""))); + locations.append(qMakePair(QString("qmfsettings"),QString(""))); return locations; } diff --git a/src/plugins/messageservices/smtp/smtp.pro b/src/plugins/messageservices/smtp/smtp.pro index bdca3472..d471f5af 100644 --- a/src/plugins/messageservices/smtp/smtp.pro +++ b/src/plugins/messageservices/smtp/smtp.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = smtp -CONFIG += qtopiamail messageserver plugin +CONFIG += qmf qmfmessageserver plugin target.path += $$QMF_INSTALL_ROOT/plugins/messageservices @@ -9,14 +9,14 @@ QT = core network DEPENDPATH += . -INCLUDEPATH += . ../../../libraries/qtopiamail \ - ../../../libraries/messageserver \ - ../../../libraries/qtopiamail/support +INCLUDEPATH += . ../../../libraries/qmf \ + ../../../libraries/qmfmessageserver \ + ../../../libraries/qmf/support -LIBS += -L../../../libraries/qtopiamail/build \ - -L../../../libraries/messageserver/build -macx:LIBS += -F../../../libraries/qtopiamail/build \ - -F../../../libraries/messageserver/build +LIBS += -L../../../libraries/qmf/build \ + -L../../../libraries/qmfmessageserver/build +macx:LIBS += -F../../../libraries/qmf/build \ + -F../../../libraries/qmfmessageserver/build HEADERS += smtpauthenticator.h \ smtpclient.h \ diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp index 7b125c3e..95ae29ca 100644 --- a/src/plugins/messageservices/smtp/smtpclient.cpp +++ b/src/plugins/messageservices/smtp/smtpclient.cpp @@ -227,7 +227,7 @@ void SmtpClient::connected(QMailTransport::EncryptType encryptType) #ifndef QT_NO_OPENSSL if ((smtpCfg.smtpEncryption() == QMailTransport::Encrypt_TLS) && (status == TLS)) { // We have entered TLS mode - restart the SMTP dialog - sendCommand("EHLO qtopia-messageserver"); + sendCommand("EHLO qmf-messageserver"); status = Helo; } #endif @@ -325,7 +325,7 @@ void SmtpClient::nextAction(const QString &response) capabilities.clear(); // We need to know if extensions are supported - sendCommand("EHLO qtopia-messageserver"); + sendCommand("EHLO qmf-messageserver"); status = Helo; } else { operationFailed(QMailServiceAction::Status::ErrUnknownResponse, response); @@ -336,7 +336,7 @@ void SmtpClient::nextAction(const QString &response) { if (responseCode == 500) { // EHLO is not implemented by this server - fallback to HELO - sendCommand("HELO qtopia-messageserver"); + sendCommand("HELO qmf-messageserver"); } else if (responseCode == 250) { if (domainName.isEmpty()) { // Extract the domain name from the greeting @@ -599,7 +599,7 @@ void SmtpClient::nextAction(const QString &response) QDir dir; if (!dir.exists(tempPath)) dir.mkpath(tempPath); - temporaryFile = new QTemporaryFile(tempPath + QLatin1String("/qtopiamail.XXXXXX")); + temporaryFile = new QTemporaryFile(tempPath + QLatin1String("smtptmp.XXXXXX")); bool ok = temporaryFile->open(); Q_ASSERT(ok); { diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro index 79ed0ba0..72e8a7cb 100644 --- a/src/tools/messageserver/messageserver.pro +++ b/src/tools/messageserver/messageserver.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = messageserver -CONFIG += messageserver qtopiamail +CONFIG += qmfmessageserver qmf QT = core !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui @@ -8,14 +8,14 @@ target.path += $$QMF_INSTALL_ROOT/bin DEPENDPATH += . -INCLUDEPATH += . ../../libraries/qtopiamail \ - ../../libraries/qtopiamail/support \ - ../../libraries/messageserver +INCLUDEPATH += . ../../libraries/qmf \ + ../../libraries/qmf/support \ + ../../libraries/qmfmessageserver -LIBS += -L../../libraries/messageserver/build \ - -L../../libraries/qtopiamail/build -macx:LIBS += -F../../libraries/messageserver/build \ - -F../../libraries/qtopiamail/build +LIBS += -L../../libraries/qmfmessageserver/build \ + -L../../libraries/qmf/build +macx:LIBS += -F../../libraries/qmfmessageserver/build \ + -F../../libraries/qmf/build HEADERS += mailmessageclient.h \ diff --git a/src/tools/messageserver/servicehandler.cpp b/src/tools/messageserver/servicehandler.cpp index d8525b47..67c495ca 100644 --- a/src/tools/messageserver/servicehandler.cpp +++ b/src/tools/messageserver/servicehandler.cpp @@ -470,7 +470,7 @@ void ServiceHandler::registerAccountServices(const QMailAccountIdList &ids) QMailAccountConfiguration config(id); // See if this account is configured to use a master account - QMailServiceConfiguration internalCfg(&config, "qtopiamail"); + QMailServiceConfiguration internalCfg(&config, "qmf"); QString masterId(internalCfg.value("masterAccountId", "")); if (!masterId.isEmpty()) { QMailAccount master(QMailAccountId(masterId.toInt())); diff --git a/tests/tests.pri b/tests/tests.pri index 1950f3dc..3d9dd898 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -4,12 +4,12 @@ macx { target.path+=$$QMF_INSTALL_ROOT/tests -QTOPIAMAIL=../../src/libraries/qtopiamail +QMFPATH=../../src/libraries/qmf DEPENDPATH += . -INCLUDEPATH += . $$QTOPIAMAIL $$QTOPIAMAIL/support -LIBS += -L$$QTOPIAMAIL/build -macx:LIBS += -F$$QTOPIAMAIL/build -QMAKE_LFLAGS += -Wl,-rpath,$$QTOPIAMAIL +INCLUDEPATH += . $$QMFPATH $$QMFPATH/support +LIBS += -L$$QMFPATH/build +macx:LIBS += -F$$QMFPATH/build +QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH include(../common.pri) diff --git a/tests/tst_longstring/tst_longstring.pro b/tests/tst_longstring/tst_longstring.pro index d3fb04de..1e968abb 100644 --- a/tests/tst_longstring/tst_longstring.pro +++ b/tests/tst_longstring/tst_longstring.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = tst_longstring -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf SOURCES += tst_longstring.cpp diff --git a/tests/tst_python_email/tst_python_email.pro b/tests/tst_python_email/tst_python_email.pro index 7fb72f88..675d387a 100644 --- a/tests/tst_python_email/tst_python_email.pro +++ b/tests/tst_python_email/tst_python_email.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf TARGET = tst_python_email DEFINES += SRCDIR=\\\"$$_PRO_FILE_PWD_\\\" diff --git a/tests/tst_qmailaddress/tst_qmailaddress.pro b/tests/tst_qmailaddress/tst_qmailaddress.pro index 72c8cb0e..da0089d6 100644 --- a/tests/tst_qmailaddress/tst_qmailaddress.pro +++ b/tests/tst_qmailaddress/tst_qmailaddress.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf TARGET = tst_qmailaddress SOURCES += tst_qmailaddress.cpp diff --git a/tests/tst_qmailcodec/tst_qmailcodec.cpp b/tests/tst_qmailcodec/tst_qmailcodec.cpp index 95317167..b31b10bf 100644 --- a/tests/tst_qmailcodec/tst_qmailcodec.cpp +++ b/tests/tst_qmailcodec/tst_qmailcodec.cpp @@ -303,8 +303,8 @@ void tst_QMailCodec::decode() */ } -extern int QTOPIAMAIL_EXPORT Base64MaxLineLength; -extern int QTOPIAMAIL_EXPORT QuotedPrintableMaxLineLength; +extern int QMF_EXPORT Base64MaxLineLength; +extern int QMF_EXPORT QuotedPrintableMaxLineLength; void tst_QMailCodec::line_lengths_data() { @@ -468,7 +468,7 @@ void tst_QMailCodec::line_lengths() } } -extern int QTOPIAMAIL_EXPORT MaxCharacters; +extern int QMF_EXPORT MaxCharacters; void tst_QMailCodec::buffer_sizes_data() { diff --git a/tests/tst_qmailcodec/tst_qmailcodec.pro b/tests/tst_qmailcodec/tst_qmailcodec.pro index 84699449..dccda9fe 100644 --- a/tests/tst_qmailcodec/tst_qmailcodec.pro +++ b/tests/tst_qmailcodec/tst_qmailcodec.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf TARGET = tst_qmailcodec SOURCES += tst_qmailcodec.cpp diff --git a/tests/tst_qmailmessage/tst_qmailmessage.pro b/tests/tst_qmailmessage/tst_qmailmessage.pro index 6eb3c521..b75e3d4f 100644 --- a/tests/tst_qmailmessage/tst_qmailmessage.pro +++ b/tests/tst_qmailmessage/tst_qmailmessage.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf TARGET = tst_qmailmessage SOURCES += tst_qmailmessage.cpp diff --git a/tests/tst_qmailmessagebody/tst_qmailmessagebody.pro b/tests/tst_qmailmessagebody/tst_qmailmessagebody.pro index 51d35856..db94940f 100644 --- a/tests/tst_qmailmessagebody/tst_qmailmessagebody.pro +++ b/tests/tst_qmailmessagebody/tst_qmailmessagebody.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf TARGET = tst_qmailmessagebody SOURCES += tst_qmailmessagebody.cpp diff --git a/tests/tst_qmailmessageheader/tst_qmailmessageheader.pro b/tests/tst_qmailmessageheader/tst_qmailmessageheader.pro index 8f6733b0..16392c47 100644 --- a/tests/tst_qmailmessageheader/tst_qmailmessageheader.pro +++ b/tests/tst_qmailmessageheader/tst_qmailmessageheader.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf TARGET = tst_qmailmessageheader SOURCES += tst_qmailmessageheader.cpp diff --git a/tests/tst_qmailmessagepart/tst_qmailmessagepart.pro b/tests/tst_qmailmessagepart/tst_qmailmessagepart.pro index 006853af..9979e728 100644 --- a/tests/tst_qmailmessagepart/tst_qmailmessagepart.pro +++ b/tests/tst_qmailmessagepart/tst_qmailmessagepart.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf TARGET = tst_qmailmessagepart SOURCES += tst_qmailmessagepart.cpp diff --git a/tests/tst_qmailstore/tst_qmailstore.pro b/tests/tst_qmailstore/tst_qmailstore.pro index 9f06acfb..b59cb3f7 100644 --- a/tests/tst_qmailstore/tst_qmailstore.pro +++ b/tests/tst_qmailstore/tst_qmailstore.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf TARGET = tst_qmailstore QT += sql diff --git a/tests/tst_qmailstorekeys/tst_qmailstorekeys.pro b/tests/tst_qmailstorekeys/tst_qmailstorekeys.pro index 8c8e2730..1418e51f 100644 --- a/tests/tst_qmailstorekeys/tst_qmailstorekeys.pro +++ b/tests/tst_qmailstorekeys/tst_qmailstorekeys.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf TARGET = tst_qmailstorekeys QT += sql diff --git a/tests/tst_qprivateimplementation/tst_qprivateimplementation.cpp b/tests/tst_qprivateimplementation/tst_qprivateimplementation.cpp index 41824cad..87c9f1be 100644 --- a/tests/tst_qprivateimplementation/tst_qprivateimplementation.cpp +++ b/tests/tst_qprivateimplementation/tst_qprivateimplementation.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -// We're effectively part of the QTOPIAMAIL library for this test: -#define QTOPIAMAIL_INTERNAL +// We're effectively part of the QMF library for this test: +#define QMF_INTERNAL #include "qprivateimplementationdef.h" #include <QObject> diff --git a/tests/tst_qprivateimplementation/tst_qprivateimplementation.pro b/tests/tst_qprivateimplementation/tst_qprivateimplementation.pro index 7cf3f87b..14863d0e 100644 --- a/tests/tst_qprivateimplementation/tst_qprivateimplementation.pro +++ b/tests/tst_qprivateimplementation/tst_qprivateimplementation.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qtestlib unittest qtopiamail +CONFIG += qtestlib unittest qmf TARGET = tst_qprivateimplementation SOURCES += tst_qprivateimplementation.cpp |