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

Ported to Qt5.

Browse Source
This commit is contained in:
Jim Evins
2016-05-27 22:45:03 -04:00
parent 5a36e9ce88
commit 699960e4be
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libglabels/CMakeLists.txt
+5 -4
View File
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
###############################################################################
# gLabels libglabels subproject
@@ -43,8 +43,8 @@ set (libglabels_qobject_headers
set (libglabels_resource_files
)
qt4_wrap_cpp (libglabels_moc_sources ${libglabels_qobject_headers})
qt4_add_resources(libglabels_qrc_sources ${libglabels_resource_files})
qt5_wrap_cpp (libglabels_moc_sources ${libglabels_qobject_headers})
qt5_add_resources(libglabels_qrc_sources ${libglabels_resource_files})
add_library (libglabels
${libglabels_sources}
@@ -57,7 +57,8 @@ add_library (libglabels
# Where to find stuff
#=======================================
include_directories (
${CMAKE_CURRENT_BINARY_DIR}
${Qt5Widgets_INCLUDE_DIRS}
${Qt5Xml_INCLUDE_DIRS}
)
link_directories (
libglabels/StrUtil.cpp
+2 -2
View File
@@ -151,7 +151,7 @@ namespace glabels
QString chunk1, chunk2;
bool isnum1, isnum2;
if ( folded_s1.at( i1 ).isNumber() )
if ( (i1 < folded_s1.size()) && folded_s1.at( i1 ).isNumber() )
{
chunk1 = spanDigits( folded_s1, &i1 );
isnum1 = true;
@@ -162,7 +162,7 @@ namespace glabels
isnum1 = false;
}
if ( folded_s2.at( i2 ).isNumber() )
if ( (i2 < folded_s2.size()) && folded_s2.at( i2 ).isNumber() )
{
chunk2 = spanDigits( folded_s2, &i2 );
isnum2 = true;