diff --git a/qelectrotech.pro b/qelectrotech.pro index fbe91915b..1142bcd25 100644 --- a/qelectrotech.pro +++ b/qelectrotech.pro @@ -59,6 +59,10 @@ DEFINES += QET_ALLOW_OVERRIDE_CTBTD_OPTION # Commenter la ligne ci-dessous pour desactiver l'option --config-dir DEFINES += QET_ALLOW_OVERRIDE_CD_OPTION +# warn on *any* usage of deprecated APIs +#DEFINES += QT_DEPRECATED_WARNINGS + + ###################################################################### include(sources/PropertiesEditor/PropertiesEditor.pri) diff --git a/sources/diagramcontext.cpp b/sources/diagramcontext.cpp index cecf47e9e..57a6e3ccf 100644 --- a/sources/diagramcontext.cpp +++ b/sources/diagramcontext.cpp @@ -18,6 +18,7 @@ #include "diagramcontext.h" #include #include "qet.h" +#include /** @return a list containing all the keys in the context object. @@ -30,7 +31,7 @@ QList DiagramContext::keys(DiagramContext::KeyOrder order) const { if (order == Alphabetical) { qSort(keys_list); } else { - qSort(keys_list.begin(), keys_list.end(), DiagramContext::stringLongerThan); + std::sort(keys_list.begin(), keys_list.end(), DiagramContext::stringLongerThan); } return(keys_list); } diff --git a/sources/editor/elementscene.cpp b/sources/editor/elementscene.cpp index 5c45afb68..495d07a42 100644 --- a/sources/editor/elementscene.cpp +++ b/sources/editor/elementscene.cpp @@ -32,6 +32,7 @@ #include "nameslist.h" #include "ui/elementpropertieseditorwidget.h" #include "eseventinterface.h" +#include #include @@ -749,7 +750,7 @@ QList ElementScene::zItems(ItemOptions options) const { // ordonne les parties par leur zValue if (options & SortByZValue) { - qSort(all_items_list.begin(), all_items_list.end(), ElementScene::zValueLessThan); + std::sort (all_items_list.begin(), all_items_list.end(), ElementScene::zValueLessThan); } // rajoute eventuellement les bornes diff --git a/sources/qetgraphicsitem/element.h b/sources/qetgraphicsitem/element.h index 580ddfa02..501c77eca 100644 --- a/sources/qetgraphicsitem/element.h +++ b/sources/qetgraphicsitem/element.h @@ -22,6 +22,7 @@ #include "qetgraphicsitem.h" #include "diagramcontext.h" #include "assignvariables.h" +#include class ElementTextItem; class QETProject; @@ -248,7 +249,7 @@ inline QUuid Element::uuid() const { * @return the list of linked elements, the list is sorted by position */ inline QList Element::linkedElements() { - qSort(connected_elements.begin(), connected_elements.end(), comparPos); + std::sort(connected_elements.begin(), connected_elements.end(), comparPos); return connected_elements; } diff --git a/sources/qetprintpreviewdialog.cpp b/sources/qetprintpreviewdialog.cpp index 4c25e9767..f684a1724 100644 --- a/sources/qetprintpreviewdialog.cpp +++ b/sources/qetprintpreviewdialog.cpp @@ -23,6 +23,7 @@ #include #include +#include /** Constructeur @@ -400,7 +401,7 @@ void QETPrintPreviewDialog::updateZoomList() { // ajout du zoom en cours if (current_zoom_is_not_null && (!zooms_real.contains(current_zoom))) { zooms_real << current_zoom; - qSort(zooms_real.begin(), zooms_real.end()); + std::sort(zooms_real.begin(), zooms_real.end()); } // remplissage de la liste deroulante diff --git a/sources/qtextorientationwidget.cpp b/sources/qtextorientationwidget.cpp index 555004e91..a1243f6fe 100644 --- a/sources/qtextorientationwidget.cpp +++ b/sources/qtextorientationwidget.cpp @@ -16,6 +16,7 @@ along with QElectroTech. If not, see . */ #include "qtextorientationwidget.h" +#include /** Constructeur @@ -283,7 +284,7 @@ QString QTextOrientationWidget::getMostUsableStringForRadius(const qreal &radius // recupere les longueurs a disposition QList available_lengths = text_size_hash_.values(); // trie les longueurs par ordre croissant - qSort(available_lengths.begin(), available_lengths.end()); + std::sort(available_lengths.begin(), available_lengths.end()); // recherche la position ou l'on insererait le rayon QList::const_iterator i = qUpperBound(available_lengths, radius);