mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-11-15 10:05:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX another bug from issue #124: a use of private Qt-API, which is undocumented and not present in all cases was replaced ...

Browse Source
This commit is contained in:
jkriege2 2024-03-15 11:36:40 +01:00
parent 77f498f04d
commit 6482ff7a49
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/jkqtcommon/jkqtpbasicimagetools.h
View File

@ -33,6 +33,7 @@
#include <limits> #include <limits>
#include "jkqtcommon/jkqtcommon_imexport.h" #include "jkqtcommon/jkqtcommon_imexport.h"
#include "jkqtcommon/jkqtpmathtools.h" #include "jkqtcommon/jkqtpmathtools.h"
#include "jkqtcommon/jkqttools.h"
/** \brief possible datatypes of the data array, plotted by this class. /** \brief possible datatypes of the data array, plotted by this class.
\ingroup jkqtplotter_imagelots_tools \ingroup jkqtplotter_imagelots_tools
@ -1203,7 +1204,7 @@ public:
push_back(v.first, v.second); push_back(v.first, v.second);
} }
} }
template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true> template <typename InputIterator, JKQTPIsInputIteratorTrait<InputIterator> = true>
inline JKQTPPaletteList(InputIterator first, InputIterator last): ListType(first, last) {} inline JKQTPPaletteList(InputIterator first, InputIterator last): ListType(first, last) {}
inline JKQTPPaletteList(ListType &&other):ListType(std::forward<ListType>(other)) {} inline JKQTPPaletteList(ListType &&other):ListType(std::forward<ListType>(other)) {}
inline JKQTPPaletteList(const ListType &other):ListType(other) {} inline JKQTPPaletteList(const ListType &other):ListType(other) {}

7
lib/jkqtcommon/jkqttools.h
View File

@ -95,5 +95,12 @@ JKQTCOMMON_LIB_EXPORT void jkloadSplitter(QSettings& settings, QSplitter* splitt
*/ */
JKQTCOMMON_LIB_EXPORT quint16 jkqtp_checksum(const void* data, size_t len); JKQTCOMMON_LIB_EXPORT quint16 jkqtp_checksum(const void* data, size_t len);
/** \brief Checks whether a given iterator is an input iterator (std::input_iterator_tag)
* \ingroup jkqtptools_general
*
**/
template <typename Iterator>
using JKQTPIsInputIteratorTrait = typename std::enable_if<std::is_convertible<typename std::iterator_traits<Iterator>::iterator_category, std::input_iterator_tag>::value, bool>::type;
#endif // JKQTTOOLS_H #endif // JKQTTOOLS_H