Removed use of deprecated Qt APIs.

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)

glabels/Db.cpp

@@ -31,6 +31,8 @@
 #include <QtDebug>
 #include <QtGlobal>
 
+#include <algorithm>
+
 
 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 );
 	}
 
 

glabels/Frame.cpp

@@ -22,6 +22,8 @@
 
 #include "Markup.h"
 
+#include <algorithm>
+
 
 namespace glabels
 {
@@ -96,7 +98,7 @@ namespace glabels
 			}
 		}
 
-		qStableSort( origins.begin(), origins.end() );
+		std::stable_sort( origins.begin(), origins.end() );
 
 		return origins;
 	}

translations/glabels_C.ts

@@ -27,7 +27,7 @@
 <context>
     <name>Db</name>
     <message>
-        <location filename="../glabels/Db.cpp" line="69"/>
+        <location filename="../glabels/Db.cpp" line="71"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -84,12 +84,12 @@
 <context>
     <name>Frame</name>
     <message>
-        <location filename="../glabels/Frame.cpp" line="120"/>
+        <location filename="../glabels/Frame.cpp" line="122"/>
         <source>%1 x %2 (%3 per sheet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../glabels/Frame.cpp" line="126"/>
+        <location filename="../glabels/Frame.cpp" line="128"/>
         <source>%1 per sheet</source>
         <translation type="unfinished"></translation>
     </message>