diff --git a/interface/src/Bookmarks.cpp b/interface/src/Bookmarks.cpp index 263723ebe0..1ead451cd0 100644 --- a/interface/src/Bookmarks.cpp +++ b/interface/src/Bookmarks.cpp @@ -115,7 +115,7 @@ bool Bookmarks::sortOrder(QAction* a, QAction* b) { void Bookmarks::sortActions(Menu* menubar, MenuWrapper* menu) { QList actions = menu->actions(); - qSort(actions.begin(), actions.end(), sortOrder); + std::sort(actions.begin(), actions.end(), sortOrder); for (QAction* action : menu->actions()) { menu->removeAction(action); } diff --git a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp index 8e6a746f55..a5f6cd2be8 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp +++ b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include "Logging.h" #include "Avatar.h" @@ -29,7 +30,7 @@ static void updateFakeCoefficients(float leftBlink, float rightBlink, float brow float jawOpen, float mouth2, float mouth3, float mouth4, QVector& coefficients) { coefficients.resize(std::max((int)coefficients.size(), (int)Blendshapes::BlendshapeCount)); - qFill(coefficients.begin(), coefficients.end(), 0.0f); + std::fill(coefficients.begin(), coefficients.end(), 0.0f); coefficients[(int)Blendshapes::EyeBlink_L] = leftBlink; coefficients[(int)Blendshapes::EyeBlink_R] = rightBlink; coefficients[(int)Blendshapes::BrowsU_C] = browUp;