Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Removed use of deprecated Qt APIs.

Browse Source
This commit is contained in:
Jim Evins
2017-05-29 21:19:47 -04:00
parent e0992db6b6
commit 9601541614
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/CMakeLists.txt
+1
View File
@@ -10,6 +10,7 @@ endif ()
# Uncomment to build with pedantic flags # Uncomment to build with pedantic flags
#add_compile_options (-Werror -Wall -Wpedantic) #add_compile_options (-Werror -Wall -Wpedantic)
#add_definitions (-DQT_DISABLE_DEPRECATED_BEFORE=0x050400)
if (${GNUBARCODE_FOUND}) if (${GNUBARCODE_FOUND})
add_definitions (-DHAVE_GNU_BARCODE=1) add_definitions (-DHAVE_GNU_BARCODE=1)
glabels/Db.cpp
+3 -1
View File
@@ -31,6 +31,8 @@
#include <QtDebug> #include <QtDebug>
#include <QtGlobal> #include <QtGlobal>
#include <algorithm>
namespace glabels namespace glabels
{ {
@@ -668,7 +670,7 @@ namespace glabels
// TODO: Read user directories // TODO: Read user directories
qStableSort( mTemplates.begin(), mTemplates.end(), partNameLessThan ); std::stable_sort( mTemplates.begin(), mTemplates.end(), partNameLessThan );
} }
glabels/Frame.cpp
+3 -1
View File
@@ -22,6 +22,8 @@
#include "Markup.h" #include "Markup.h"
#include <algorithm>
namespace glabels namespace glabels
{ {
@@ -96,7 +98,7 @@ namespace glabels
} }
} }
qStableSort( origins.begin(), origins.end() ); std::stable_sort( origins.begin(), origins.end() );
return origins; return origins;
} }
translations/glabels_C.ts
+3 -3
View File
@@ -27,7 +27,7 @@
<context> <context>
<name>Db</name> <name>Db</name>
<message> <message>
<location filename="../glabels/Db.cpp" line="69"/> <location filename="../glabels/Db.cpp" line="71"/>
<source>Other</source> <source>Other</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -84,12 +84,12 @@
<context> <context>
<name>Frame</name> <name>Frame</name>
<message> <message>
<location filename="../glabels/Frame.cpp" line="120"/> <location filename="../glabels/Frame.cpp" line="122"/>
<source>%1 x %2 (%3 per sheet)</source> <source>%1 x %2 (%3 per sheet)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../glabels/Frame.cpp" line="126"/> <location filename="../glabels/Frame.cpp" line="128"/>
<source>%1 per sheet</source> <source>%1 per sheet</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>