Commit f62e7029 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: we depend against qt5.7 now. Clean up

parent 20cfe671
......@@ -17,7 +17,7 @@ set(KF5_VERSION "5.32.0")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.5.40")
set(QT_REQUIRED_VERSION "5.6.0")
set(QT_REQUIRED_VERSION "5.7.0")
set(AKONADI_VERSION "5.5.40")
set(GRANTLEETHEME_LIB_VERSION "5.5.40")
......
......@@ -22,7 +22,7 @@
#include "attachmentcontrollerbase.h"
#include "helper/helper_p.h"
#include <MessageComposer/AttachmentModel>
#include "MessageComposer/AttachmentJob"
......
......@@ -18,7 +18,7 @@
*/
#include "attachmentmodel.h"
#include "helper/helper_p.h"
#include <QMimeData>
#include <QUrl>
......
......@@ -20,7 +20,7 @@
*/
#include "composer.h"
#include "helper_p.h"
#include "job/attachmentjob.h"
#include "part/globalpart.h"
......
/*
Copyright (c) 2017 Laurent Montel <montel@kde.org>
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
This library is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#ifndef _HELPER_H
#define _HELPER_H
#include <qglobal.h>
#if QT_VERSION < QT_VERSION_CHECK(5,7,0)
namespace QtPrivate
{
template <typename T> struct QAddConst {
typedef const T Type;
};
}
// this adds const to non-const objects (like std::as_const)
template <typename T>
Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW { return t; }
// prevent rvalue arguments:
template <typename T>
void qAsConst(const T &&) Q_DECL_EQ_DELETE;
#endif
#endif
......@@ -24,7 +24,7 @@
#include "messagefactoryforwardjob.h"
#include "messagefactoryreplyjob.h"
#include "MessageComposer/Util"
#include "helper/helper_p.h"
#include <AkonadiCore/item.h>
#ifndef QT_NO_CURSOR
......
......@@ -46,11 +46,9 @@ void MessageFactoryReplyJob::start()
parser->setIdentityManager(mIdentityManager);
parser->setCharsets(MessageComposerSettings::self()->preferredCharsets());
parser->setWordWrap(MessageComposerSettings::wordWrap(), MessageComposerSettings::lineWrapWidth());
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 1)
if (MessageComposer::MessageComposerSettings::quoteSelectionOnly()) {
parser->setSelection(mSelection);
}
#endif
parser->setAllowDecryption(true);
if (!mTemplate.isEmpty()) {
parser->process(mTemplate, mOrigMsg);
......
......@@ -21,7 +21,7 @@
*/
#include "aliasesexpandjob.h"
#include "helper/helper_p.h"
#include "distributionlistexpandjob.h"
#include <Akonadi/Contact/ContactSearchJob>
......
......@@ -22,7 +22,7 @@
*/
#include "job/emailaddressresolvejob.h"
#include "helper/helper_p.h"
#include "aliasesexpandjob.h"
#include "settings/messagecomposersettings.h"
......
......@@ -19,7 +19,7 @@
#include "job/multipartjob.h"
#include "contentjobbase_p.h"
#include "helper/helper_p.h"
#include "messagecomposer_debug.h"
......
......@@ -20,7 +20,7 @@
*/
#include "distributionlistdialog.h"
#include "helper/helper_p.h"
#include <AkonadiWidgets/collectiondialog.h>
#include <Akonadi/Contact/ContactGroupSearchJob>
#include <Akonadi/Contact/ContactSearchJob>
......
......@@ -23,7 +23,7 @@
#include "utils/util.h"
#include "util_p.h"
#include "helper/helper_p.h"
#include "composer/composer.h"
#include "job/singlepartjob.h"
......
......@@ -20,7 +20,7 @@
#include "core/filter.h"
#include "core/messageitem.h"
#include "helper_p.h"
#include <AkonadiSearch/PIM/emailquery.h>
#include <AkonadiSearch/PIM/resultiterator.h>
......
......@@ -19,7 +19,7 @@
#include "searchcollectionindexingwarning.h"
#include "messagelist_debug.h"
#include "helper_p.h"
#include <AkonadiCore/persistentsearchattribute.h>
#include <AkonadiCore/collectionfetchjob.h>
......
......@@ -16,7 +16,7 @@
*/
#include "searchlinestatus.h"
#include "helper_p.h"
#include <KLocalizedString>
#include <QAction>
#include <QStandardPaths>
......
/*
Copyright (c) 2017 Laurent Montel <montel@kde.org>
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
This library is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#ifndef _HELPER_H
#define _HELPER_H
#include <qglobal.h>
#if QT_VERSION < QT_VERSION_CHECK(5,7,0)
namespace QtPrivate
{
template <typename T> struct QAddConst {
typedef const T Type;
};
}
// this adds const to non-const objects (like std::as_const)
template <typename T>
Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW { return t; }
// prevent rvalue arguments:
template <typename T>
void qAsConst(const T &&) Q_DECL_EQ_DELETE;
#endif
#endif
......@@ -17,7 +17,7 @@
*/
#include "pane.h"
#include "helper_p.h"
#include <KActionCollection>
#include <KActionMenu>
......
......@@ -18,7 +18,7 @@
*/
#include "aggregationcombobox.h"
#include "aggregationcombobox_p.h"
#include "helper_p.h"
#include "core/aggregation.h"
#include "core/manager.h"
......
......@@ -20,7 +20,7 @@
#include "utils/themecombobox.h"
#include "utils/themecombobox_p.h"
#include "helper_p.h"
#include "storagemodel.h"
#include "core/manager.h"
#include "core/theme.h"
......
......@@ -23,7 +23,7 @@
#include "settings/messageviewersettings.h"
#include "utils/iconnamecache.h"
#include "config-messageviewer.h"
#include "utils/helper_p.h"
#include <MessageCore/StringUtil>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment