Commit f8cffc87 authored by Laurent Montel's avatar Laurent Montel 😁

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

parent 58ae6927
......@@ -37,7 +37,7 @@ set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
set(KDEPIM_LIB_SOVERSION "5")
set(QT_REQUIRED_VERSION "5.6.0")
set(QT_REQUIRED_VERSION "5.7.0")
set(KONTACTINTERFACE_LIB_VERSION "5.5.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.5.40")
......
......@@ -25,7 +25,7 @@
#include "akregator_part.h"
#include "akregator_debug.h"
#include "helper_p.h"
#include "config-akregator.h"
#include "messageviewer/messageviewersettings.h"
#include "akregatorconfig.h"
......
......@@ -27,7 +27,7 @@
#include "feed.h"
#include "feedlist.h"
#include "kernel.h"
#include "helper_p.h"
#include "akregator_debug.h"
#include <KLocalizedString>
......
......@@ -25,7 +25,7 @@
#include "articleviewerwidget.h"
#include "helper_p.h"
#include "akregatorconfig.h"
#include "aboutdata.h"
#include "actionmanager.h"
......
......@@ -23,11 +23,11 @@
*/
#include "expireitemscommand.h"
#include "helper_p.h"
#include "articlejobs.h"
#include "feed.h"
#include "feedlist.h"
#include "helper_p.h"
#include "akregator_debug.h"
......
......@@ -24,7 +24,7 @@
*/
#include "feed.h"
#include "helper_p.h"
#include "akregatorconfig.h"
#include "article.h"
#include "articlejobs.h"
......
......@@ -27,7 +27,7 @@
#include "akregatorconfig.h"
#include "feed.h"
#include "treenode.h"
#include "helper_p.h"
#include <QList>
......
......@@ -25,7 +25,7 @@
#include "folder.h"
#include "article.h"
#include "articlejobs.h"
#include "helper_p.h"
#include "feed.h"
#include "fetchqueue.h"
#include "treenodevisitor.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)
template <typename... Args>
struct QNonConstOverload
{
template <typename R, typename T>
Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr)
{ return ptr; }
template <typename R, typename T>
static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr)
{ return ptr; }
};
template <typename... Args>
struct QConstOverload
{
template <typename R, typename T>
Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...) const) const Q_DECL_NOTHROW -> decltype(ptr)
{ return ptr; }
template <typename R, typename T>
static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...) const) Q_DECL_NOTHROW -> decltype(ptr)
{ return ptr; }
};
template <typename... Args>
struct QOverload : QConstOverload<Args...>, QNonConstOverload<Args...>
{
using QConstOverload<Args...>::of;
using QConstOverload<Args...>::operator();
using QNonConstOverload<Args...>::of;
using QNonConstOverload<Args...>::operator();
template <typename R>
Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr)
{ return ptr; }
template <typename R>
static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr)
{ return ptr; }
};
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
......@@ -43,7 +43,7 @@
#include "expireitemscommand.h"
#include "importfeedlistcommand.h"
#include "feed.h"
#include "helper_p.h"
#include "feedlist.h"
#include "feedpropertiesdialog.h"
#include "fetchqueue.h"
......
......@@ -24,7 +24,7 @@
#include "notificationmanager.h"
#include "feed.h"
#include "helper_p.h"
#include <KLocalizedString>
#include <knotification.h>
......
......@@ -28,7 +28,7 @@
#include "folder.h"
#include "subscriptionlistjobs.h"
#include "treenode.h"
#include "helper_p.h"
#include "akregator_debug.h"
#include <KIconLoader>
......
......@@ -23,7 +23,7 @@
*/
#include "tabwidget.h"
#include "helper_p.h"
#include <QStyle>
#include <QApplication>
......
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