diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2014-01-21 10:19:01 +0100 |
|---|---|---|
| committer | Robin Burchell <robin+qt@viroteck.net> | 2014-01-21 10:27:17 +0100 |
| commit | 2794726b6ee1659a631427c325229394a0312d05 (patch) | |
| tree | dbdb255b8c6bd069edf1449a92ab431045f16e95 /examples/qtmail/plugins | |
| parent | 78c9582b11e9ea7f9e99bf0b89ee8db6cb276b12 (diff) | |
Remove Qt 4 support.
This has persisted long enough, and as far as I am aware, has no users. It is
also blocking potential build system cleanups and other good things.
Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Change-Id: I5e0e0549ef6ffee31b5e60ec94a9e17f27e01436
Reviewed-by: John Brooks <john.brooks@dereferenced.net>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'examples/qtmail/plugins')
8 files changed, 31 insertions, 96 deletions
diff --git a/examples/qtmail/plugins/composers/email/attachmentlistwidget.cpp b/examples/qtmail/plugins/composers/email/attachmentlistwidget.cpp index e1dc17d2..4dc0799b 100644 --- a/examples/qtmail/plugins/composers/email/attachmentlistwidget.cpp +++ b/examples/qtmail/plugins/composers/email/attachmentlistwidget.cpp @@ -405,11 +405,7 @@ m_clearLink(new QLabel(this)) connect(header,SIGNAL(clear()),this,SLOT(clearClicked())); m_listView->setHeader(header); m_listView->header()->setStretchLastSection(true); -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) m_listView->header()->setSectionResizeMode(QHeaderView::ResizeToContents); -#else - m_listView->header()->setResizeMode(QHeaderView::ResizeToContents); -#endif m_listView->header()->setDefaultSectionSize(180); m_listView->setUniformRowHeights(true); m_listView->setRootIsDecorated(false); diff --git a/examples/qtmail/plugins/composers/email/email.pro b/examples/qtmail/plugins/composers/email/email.pro index 11637865..dc98e298 100644 --- a/examples/qtmail/plugins/composers/email/email.pro +++ b/examples/qtmail/plugins/composers/email/email.pro @@ -2,22 +2,12 @@ TEMPLATE = lib TARGET = emailcomposer CONFIG += qmfclient qmfutil plugin -equals(QT_MAJOR_VERSION, 4) { - target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/composers - macx:contains(QT_CONFIG, qt_framework) { - LIBS += -framework qmfclient -framework qmfutil - } else { - LIBS += -lqmfclient -lqmfutil - } -} -equals(QT_MAJOR_VERSION, 5) { - target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/composers - QT += widgets - macx:contains(QT_CONFIG, qt_framework) { - LIBS += -framework qmfclient5 -framework qmfutil5 - } else { - LIBS += -lqmfclient5 -lqmfutil5 - } +target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/composers +QT += widgets +macx:contains(QT_CONFIG, qt_framework) { + LIBS += -framework qmfclient5 -framework qmfutil5 +} else { + LIBS += -lqmfclient5 -lqmfutil5 } DEFINES += PLUGIN_INTERNAL diff --git a/examples/qtmail/plugins/composers/email/emailcomposer.cpp b/examples/qtmail/plugins/composers/email/emailcomposer.cpp index a42b5fbe..c4f3b0ed 100644 --- a/examples/qtmail/plugins/composers/email/emailcomposer.cpp +++ b/examples/qtmail/plugins/composers/email/emailcomposer.cpp @@ -53,9 +53,6 @@ #include <QTextEdit> #include <QStackedWidget> #include <qmailaccount.h> -#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) -#include <QInputContext> -#endif #include <QStyle> #include <QMenu> #include <qmailnamespace.h> @@ -521,11 +518,8 @@ m_composer(composer) bool BodyTextEdit::isComposing() { -#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) - return (inputContext() && inputContext()->isComposing()); -#else +#warning "always false since Qt 5 port" return false; -#endif } bool BodyTextEdit::isEmpty() @@ -1253,8 +1247,5 @@ QString EmailComposerInterface::quotePrefix() { return "> "; } -#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) -Q_EXPORT_PLUGIN2(emailcomposer, EmailComposerInterface); -#endif #include "emailcomposer.moc" diff --git a/examples/qtmail/plugins/composers/email/emailcomposer.h b/examples/qtmail/plugins/composers/email/emailcomposer.h index ed563ced..e1bfe91d 100644 --- a/examples/qtmail/plugins/composers/email/emailcomposer.h +++ b/examples/qtmail/plugins/composers/email/emailcomposer.h @@ -63,9 +63,7 @@ QT_END_NAMESPACE class EmailComposerInterface : public QMailComposerInterface { Q_OBJECT -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) Q_PLUGIN_METADATA(IID "org.qt-project.Qt.EmailComposerInterfaceHandlerFactoryInterface") -#endif public: EmailComposerInterface( QWidget *parent = 0 ); diff --git a/examples/qtmail/plugins/viewers/generic/browserwidget.cpp b/examples/qtmail/plugins/viewers/generic/browserwidget.cpp index 9d670175..1eff78df 100644 --- a/examples/qtmail/plugins/viewers/generic/browserwidget.cpp +++ b/examples/qtmail/plugins/viewers/generic/browserwidget.cpp @@ -86,29 +86,6 @@ static QString dateString(const QDateTime& dt) } } -//QString Qt::escape ( const QString & plain ) is deprecated in Qt 5.0 -static QString htmlEscaped(const QString& plain) -{ -#if QT_VERSION >= 0x050000 - return plain.toHtmlEscaped(); -#else - return Qt::escape(plain); -#endif -} - -#if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0)) - -QT_BEGIN_NAMESPACE - -static uint qHash(const QUrl &url) -{ - return qHash(url.toString()); -} - -QT_END_NAMESPACE - -#endif - #ifdef USE_WEBKIT class ContentReply : public QNetworkReply { @@ -415,10 +392,10 @@ void BrowserWidget::setPartResource(const QMailMessagePart& part) QString name(part.displayName()); if (!name.isEmpty()) { // use 'qmf-part' url scheme to ensure inline images without a contentId are rendered - names.insert(QUrl("qmf-part:" + htmlEscaped(name))); + names.insert(QUrl("qmf-part:" + name.toHtmlEscaped())); } - name = htmlEscaped(part.contentID()); + name = part.contentID().toHtmlEscaped(); if (!name.isEmpty()) { // We can only resolve URLs using the cid: scheme if (name.startsWith("cid:", Qt::CaseInsensitive)) { @@ -430,10 +407,10 @@ void BrowserWidget::setPartResource(const QMailMessagePart& part) #else QString name(part.displayName()); if (!name.isEmpty()) { - names.insert(QUrl(htmlEscaped(name))); + names.insert(QUrl(name.toHtmlEscaped())); } - name = htmlEscaped(part.contentID()); + name = part.contentID().toHtmlEscaped(); if (!name.isEmpty()) { // Add the content both with and without the cid: prefix names.insert(name); @@ -446,7 +423,7 @@ void BrowserWidget::setPartResource(const QMailMessagePart& part) name = part.contentType().name(); if (!name.isEmpty()) { - names.insert(QUrl(htmlEscaped(name))); + names.insert(QUrl(name.toHtmlEscaped())); } #endif @@ -675,7 +652,7 @@ QString BrowserWidget::renderSimplePart(const QMailMessagePart& part) { QString result; - QString partId = htmlEscaped(part.displayName()); + QString partId = part.displayName().toHtmlEscaped(); QMailMessageContentType contentType = part.contentType(); if ( contentType.type().toLower() == "text") { // No tr @@ -708,7 +685,7 @@ QString BrowserWidget::renderSimplePart(const QMailMessagePart& part) QString BrowserWidget::renderAttachment(const QMailMessagePart& part) { - QString partId = htmlEscaped(part.displayName()); + QString partId = part.displayName().toHtmlEscaped(); QString attachmentTemplate = "<hr><b>ATTACHMENT_TEXT</b>: <a href=\"attachment;ATTACHMENT_ACTION;ATTACHMENT_LOCATION\">NAME_TEXT</a>DISPOSITION<br>"; @@ -933,7 +910,7 @@ void BrowserWidget::displayHtml(const QMailMessage* mail) headerTemplate = replaceLast(headerTemplate, "HIGHLIGHT_COLOR", palette().color(QPalette::Highlight).name()); headerTemplate = replaceLast(headerTemplate, "LINK_COLOR", palette().color(QPalette::HighlightedText).name()); - headerTemplate = replaceLast(headerTemplate, "SUBJECT_TEXT", htmlEscaped(subjectText)); + headerTemplate = replaceLast(headerTemplate, "SUBJECT_TEXT", subjectText.toHtmlEscaped()); headerTemplate = replaceLast(headerTemplate, "WINDOW_COLOR", palette().color(QPalette::Window).name()); QString itemTemplate = @@ -948,7 +925,7 @@ void BrowserWidget::displayHtml(const QMailMessage* mail) QString metadataText; foreach (const TextPair item, metadata) { - QString element = replaceLast(itemTemplate, "ID_TEXT", htmlEscaped(item.first)); + QString element = replaceLast(itemTemplate, "ID_TEXT", item.first.toHtmlEscaped()); element = replaceLast(element, "CONTENT_TEXT", item.second); metadataText.append(element); } @@ -1382,7 +1359,7 @@ QString BrowserWidget::encodeUrlAndMail(const QString& txt) } // Write the unmatched text out in escaped form - result.append(htmlEscaped(txt.mid(lastPos, (*matchPos - lastPos)))); + result.append(txt.mid(lastPos, (*matchPos - lastPos)).toHtmlEscaped()); result.append(replacement); @@ -1403,7 +1380,7 @@ QString BrowserWidget::encodeUrlAndMail(const QString& txt) } if (lastPos < txt.length()) { - result.append(htmlEscaped(txt.mid(lastPos))); + result.append(txt.mid(lastPos).toHtmlEscaped()); } return result.join(""); @@ -1422,7 +1399,7 @@ void BrowserWidget::scrollToAnchor(const QString& anchor) void BrowserWidget::setPlainText(const QString& text) { #ifdef USE_WEBKIT - QString html(htmlEscaped(text)); + QString html(text.toHtmlEscaped()); html.replace("\n", "<br>"); m_webView->setHtml("<html><body>" + html + "</body></html>"); m_webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); @@ -1469,28 +1446,28 @@ QString BrowserWidget::listRefMailTo(const QList<QMailAddress>& list) QString BrowserWidget::refMailTo(const QMailAddress& address) { - QString name = htmlEscaped(address.toString()); + QString name = address.toString().toHtmlEscaped(); if (name == "System") return name; if (address.isPhoneNumber() || address.isEmailAddress()) - return "<a href=\"mailto:" + htmlEscaped(address.address()) + "\">" + name + "</a>"; + return "<a href=\"mailto:" + address.address().toHtmlEscaped() + "\">" + name + "</a>"; return name; } QString BrowserWidget::refNumber(const QString& number) { - return "<a href=\"dial;" + htmlEscaped(number) + "\">" + number + "</a>"; + return "<a href=\"dial;" + number.toHtmlEscaped() + "\">" + number + "</a>"; } QString BrowserWidget::refUrl(const QString& url, const QString& scheme, const QString& leading, const QString& trailing) { // Assume HTTP if there is no scheme - QString escaped(htmlEscaped(url)); + QString escaped(url.toHtmlEscaped()); QString target(scheme.isEmpty() ? "http://" + escaped : escaped); - return htmlEscaped(leading) + "<a href=\"" + target + "\">" + escaped + "</a>" + htmlEscaped(trailing); + return leading.toHtmlEscaped() + "<a href=\"" + target + "\">" + escaped + "</a>" + trailing.toHtmlEscaped(); } #include "browserwidget.moc" diff --git a/examples/qtmail/plugins/viewers/generic/generic.pro b/examples/qtmail/plugins/viewers/generic/generic.pro index d67c4445..7b3fadf1 100644 --- a/examples/qtmail/plugins/viewers/generic/generic.pro +++ b/examples/qtmail/plugins/viewers/generic/generic.pro @@ -2,29 +2,17 @@ TEMPLATE = lib TARGET = genericviewer CONFIG += qmfclient qmfutil plugin -equals(QT_MAJOR_VERSION, 4) { - target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/viewers - macx:contains(QT_CONFIG, qt_framework) { - LIBS += -framework qmfclient -framework qmfutil - } else { - LIBS += -lqmfclient -lqmfutil - } -} -equals(QT_MAJOR_VERSION, 5) { - target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/viewers - QT += widgets - macx:contains(QT_CONFIG, qt_framework) { - LIBS += -framework qmfclient5 -framework qmfutil5 - } else { - LIBS += -lqmfclient5 -lqmfutil5 - } +target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/viewers +QT += widgets +macx:contains(QT_CONFIG, qt_framework) { + LIBS += -framework qmfclient5 -framework qmfutil5 +} else { + LIBS += -lqmfclient5 -lqmfutil5 } # Use webkit to render mail if available contains(QT_CONFIG,webkit){ - QT += network - equals(QT_MAJOR_VERSION, 5): QT += webkitwidgets - else: QT += webkit + QT += network webkitwidgets DEFINES += USE_WEBKIT } diff --git a/examples/qtmail/plugins/viewers/generic/genericviewer.cpp b/examples/qtmail/plugins/viewers/generic/genericviewer.cpp index 15266107..c3534938 100644 --- a/examples/qtmail/plugins/viewers/generic/genericviewer.cpp +++ b/examples/qtmail/plugins/viewers/generic/genericviewer.cpp @@ -242,6 +242,3 @@ void GenericViewer::dialogFinished(int) attachmentDialog = 0; } -#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) -Q_EXPORT_PLUGIN2(generic,GenericViewer); -#endif diff --git a/examples/qtmail/plugins/viewers/generic/genericviewer.h b/examples/qtmail/plugins/viewers/generic/genericviewer.h index 6e1ce2a7..d84b5755 100644 --- a/examples/qtmail/plugins/viewers/generic/genericviewer.h +++ b/examples/qtmail/plugins/viewers/generic/genericviewer.h @@ -62,9 +62,7 @@ QT_END_NAMESPACE class GenericViewer : public QMailViewerInterface { Q_OBJECT -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) Q_PLUGIN_METADATA(IID "org.qt-project.Qt.GenericViewerPluginHandlerFactoryInterface") -#endif public: GenericViewer(QWidget* parent = 0); |