Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add-qt5.12.12-compatibility #127

Merged
merged 4 commits into from
Mar 18, 2024
Merged

Add-qt5.12.12-compatibility #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bb7093
add qt5.12.12 compatibility
Social-Mean Mar 15, 2024
d39b253
add qt5.12.12-compatibility
Social-Mean Mar 15, 2024
cbaa479
add qt5.12.12-compatibility
Social-Mean Mar 15, 2024
5e563b3
fix: add default argument in Data's constructor
Social-Mean Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/libexampletools/jkqtpexampleapplication.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public Q_SLOTS:
inline Data(const std::function<void(void)>& f_):
type(FunctorType), f(f_), plotf(), p(nullptr)
{}
inline Data(JKQTPlotter* p_):
inline Data(JKQTPlotter* p_=nullptr):
type(PlotterType), f(), plotf(), p(p_)
{}
inline Data(std::function<JKQTPlotter*(void)> p_):
Expand Down
5 changes: 4 additions & 1 deletion lib/jkqtcommon/jkqtpmathtools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,10 @@ JKQTCOMMON_LIB_EXPORT void jkqtp_estimateFraction(double input, int &sign, uint6
*/
template <class T>
inline T jkqtp_reversed(const T& l) {
return T(l.rbegin(), l.rend());
T reversed_l;
reversed_l.reserve(l.size());
std::reverse_copy(l.begin(), l.end(), std::back_inserter(reversed_l));
return reversed_l;
}

/*! \brief can be used to build a hash-values from several hash-values
Expand Down
2 changes: 1 addition & 1 deletion tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ void doListStyles(const QDir& outputDir, const QStringList& doctomodify, int ico
shtml<<"<table>\n <tr>\n <th>Style-file\n <th>Screenshot\n <th>Symbols\n";
auto files=dir.entryList();
if (files.indexOf("default.ini")>=0) {
files.swapItemsAt(0,files.indexOf("default.ini"));
qSwap(files[0], files[files.indexOf("default.ini")]);
}
for (auto& f: files) {
qDebug()<<"plotting example for style "<<f;
Expand Down