diff --git a/glabels/CMakeLists.txt b/glabels/CMakeLists.txt index 900e393..1fff271 100644 --- a/glabels/CMakeLists.txt +++ b/glabels/CMakeLists.txt @@ -10,6 +10,7 @@ endif () # Uncomment to build with pedantic flags #add_compile_options (-Werror -Wall -Wpedantic) +#add_definitions (-DQT_DISABLE_DEPRECATED_BEFORE=0x050400) if (${GNUBARCODE_FOUND}) add_definitions (-DHAVE_GNU_BARCODE=1) diff --git a/glabels/Db.cpp b/glabels/Db.cpp index a136ac6..f1e9680 100644 --- a/glabels/Db.cpp +++ b/glabels/Db.cpp @@ -31,6 +31,8 @@ #include #include +#include + namespace glabels { @@ -668,7 +670,7 @@ namespace glabels // TODO: Read user directories - qStableSort( mTemplates.begin(), mTemplates.end(), partNameLessThan ); + std::stable_sort( mTemplates.begin(), mTemplates.end(), partNameLessThan ); } diff --git a/glabels/Frame.cpp b/glabels/Frame.cpp index b4248fe..1e82b99 100644 --- a/glabels/Frame.cpp +++ b/glabels/Frame.cpp @@ -22,6 +22,8 @@ #include "Markup.h" +#include + namespace glabels { @@ -96,7 +98,7 @@ namespace glabels } } - qStableSort( origins.begin(), origins.end() ); + std::stable_sort( origins.begin(), origins.end() ); return origins; } diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts index 68bf213..76b1c2e 100644 --- a/translations/glabels_C.ts +++ b/translations/glabels_C.ts @@ -27,7 +27,7 @@ Db - + Other @@ -84,12 +84,12 @@ Frame - + %1 x %2 (%3 per sheet) - + %1 per sheet