aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code style.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2022-01-29 09:46:01 +02:00
parent ec804740a5
commit a6f0ab2b3f
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/libs/vmisc/compatibility.h
View File

@ -39,7 +39,7 @@ class QPointF;
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T, template <typename> class Cont> template <typename T, template <typename> class Cont>
inline const T& ConstFirst (const Cont<T> &container) inline auto ConstFirst (const Cont<T> &container) -> const T&
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
return container.constFirst(); return container.constFirst();
@ -50,7 +50,7 @@ inline const T& ConstFirst (const Cont<T> &container)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T, typename C> template <typename T, typename C>
inline const T& ConstFirst (const C &container) inline auto ConstFirst (const C &container) -> const T&
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
return container.constFirst(); return container.constFirst();
@ -61,7 +61,7 @@ inline const T& ConstFirst (const C &container)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T, template <typename> class Cont> template <typename T, template <typename> class Cont>
inline const T& ConstLast (const Cont<T> &container) inline auto ConstLast (const Cont<T> &container) -> const T&
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
return container.constLast(); return container.constLast();
@ -72,7 +72,7 @@ inline const T& ConstLast (const Cont<T> &container)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T, typename C> template <typename T, typename C>
inline const T& ConstLast (const C &container) inline auto ConstLast (const C &container) -> const T&
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
return container.constLast(); return container.constLast();
@ -83,7 +83,7 @@ inline const T& ConstLast (const C &container)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T> template <typename T>
inline typename T::IntersectType Intersects(const T &l1, const T &l2, QPointF *intersectionPoint) inline auto Intersects(const T &l1, const T &l2, QPointF *intersectionPoint) -> typename T::IntersectType
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
return l1.intersects(l2, intersectionPoint); return l1.intersects(l2, intersectionPoint);
@ -94,7 +94,7 @@ inline typename T::IntersectType Intersects(const T &l1, const T &l2, QPointF *i
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T, template <typename> class C> template <typename T, template <typename> class C>
inline QList<T> ConvertToList(const C<T> &container) inline auto ConvertToList(const C<T> &container) -> QList<T>
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
return QList<T>(container.begin(), container.end()); return QList<T>(container.begin(), container.end());
@ -105,7 +105,7 @@ inline QList<T> ConvertToList(const C<T> &container)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T, template <typename> class C> template <typename T, template <typename> class C>
inline QSet<T> ConvertToSet(const C<T> &container) inline auto ConvertToSet(const C<T> &container) -> QSet<T>
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
return QSet<T>(container.begin(), container.end()); return QSet<T>(container.begin(), container.end());
@ -116,7 +116,7 @@ inline QSet<T> ConvertToSet(const C<T> &container)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T, typename C> template <typename T, typename C>
inline QSet<T> ConvertToSet(const C &container) inline auto ConvertToSet(const C &container) -> QSet<T>
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
return QSet<T>(container.begin(), container.end()); return QSet<T>(container.begin(), container.end());
@ -127,7 +127,7 @@ inline QSet<T> ConvertToSet(const C &container)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T, template <typename> class C> template <typename T, template <typename> class C>
inline QVector<T> ConvertToVector(const C<T> &container) inline auto ConvertToVector(const C<T> &container) -> QVector<T>
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
return QVector<T>(container.begin(), container.end()); return QVector<T>(container.begin(), container.end());
@ -138,7 +138,7 @@ inline QVector<T> ConvertToVector(const C<T> &container)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T> template <typename T>
inline QVector<T> ConvertToVector(const QSet<T> &container) inline auto ConvertToVector(const QSet<T> &container) -> QVector<T>
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
return QVector<T>(container.begin(), container.end()); return QVector<T>(container.begin(), container.end());
@ -174,8 +174,8 @@ inline void Move(T &vector, int from, int to)
return; return;
} }
typename T::iterator b = vector.begin(); typename T::iterator b = vector.begin();
from < to ? std::rotate(b + from, b + from + 1, b + to + 1): from < to ? std::rotate(b + from, b + from + 1, b + to + 1)
std::rotate(b + to, b + from, b + from + 1); : std::rotate(b + to, b + from, b + from + 1);
#else #else
vector.move(from, to); vector.move(from, to);
#endif // QT_VERSION < QT_VERSION_CHECK(5, 6, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
@ -185,7 +185,7 @@ inline void Move(T &vector, int from, int to)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T> template <typename T>
QVector<T> Reverse(const QVector<T> &container) auto Reverse(const QVector<T> &container) -> QVector<T>
{ {
if (container.isEmpty()) if (container.isEmpty())
{ {
@ -203,14 +203,14 @@ QVector<T> Reverse(const QVector<T> &container)
template <typename T, template <typename> class C> template <typename T, template <typename> class C>
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
C<T> Reverse(const C<T> &container) auto Reverse(const C<T> &container) -> C<T>
{ {
return ConvertToList(Reverse(ConvertToVector(container))); return ConvertToList(Reverse(ConvertToVector(container)));
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T, typename std::enable_if<std::is_same<T, QStringList>::value, T>::type* = nullptr> template <typename T, typename std::enable_if<std::is_same<T, QStringList>::value, T>::type* = nullptr>
T Reverse(const T &container) auto Reverse(const T &container) -> T
{ {
return Reverse<QString, QList>(container); return Reverse<QString, QList>(container);
} }
@ -231,7 +231,7 @@ inline void AppendTo(Cont &container, const Input &input)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T> template <typename T>
inline bool SetIntersects(const QSet<T> &set1, const QSet<T> &set2) inline auto SetIntersects(const QSet<T> &set1, const QSet<T> &set2) -> bool
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
return set1.intersects(set2); return set1.intersects(set2);
@ -244,11 +244,12 @@ inline bool SetIntersects(const QSet<T> &set1, const QSet<T> &set2)
while (i != e) while (i != e)
{ {
if (biggestSet.contains(*i)) if (biggestSet.contains(*i))
{
return true; return true;
}
++i; ++i;
} }
return false; return false;
#endif #endif
} }