mirror of
https://github.com/jkriege2/JKQtPlotter.git
synced 2024-12-25 01:51:49 +08:00
FIX another bug from issue #124: a use of private Qt-API, which is undocumented and not present in all cases was replaced ...
This commit is contained in:
parent
77f498f04d
commit
6482ff7a49
@ -33,6 +33,7 @@
|
||||
#include <limits>
|
||||
#include "jkqtcommon/jkqtcommon_imexport.h"
|
||||
#include "jkqtcommon/jkqtpmathtools.h"
|
||||
#include "jkqtcommon/jkqttools.h"
|
||||
|
||||
/** \brief possible datatypes of the data array, plotted by this class.
|
||||
\ingroup jkqtplotter_imagelots_tools
|
||||
@ -1203,7 +1204,7 @@ public:
|
||||
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(ListType &&other):ListType(std::forward<ListType>(other)) {}
|
||||
inline JKQTPPaletteList(const ListType &other):ListType(other) {}
|
||||
|
@ -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);
|
||||
|
||||
/** \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
|
||||
|
Loading…
Reference in New Issue
Block a user