diff -Nru grantlee5-5.0.0/appveyor.yml grantlee5-5.1.0/appveyor.yml --- grantlee5-5.0.0/appveyor.yml 1970-01-01 00:00:00.000000000 +0000 +++ grantlee5-5.1.0/appveyor.yml 2016-04-19 06:33:17.000000000 +0000 @@ -0,0 +1,103 @@ +version: '{build}' + +branches: + only: + - master + - next +shallow_clone: true +clone_depth: 1 + +init: + - git config --global core.autocrlf input + +clone_folder: c:\dev\grantlee + +environment: + matrix: + - CMAKE_GENERATOR: "Ninja" + QT5: C:\Qt\5.5\msvc2013 + PLATFORM: X86 + VSVER: 12 + - CMAKE_GENERATOR: "Ninja" + QT5: C:\Qt\5.5\msvc2013_64 + PLATFORM: X64 + VSVER: 12 + - CMAKE_GENERATOR: "Ninja" + QT5: C:\Qt\5.6\msvc2015 + PLATFORM: X86 + VSVER: 14 + - CMAKE_GENERATOR: "Ninja" + QT5: C:\Qt\5.6\msvc2015_64 + PLATFORM: X64 + VSVER: 14 + - CMAKE_GENERATOR: "Visual Studio 12" + QT5: C:\Qt\5.5\msvc2013 + PLATFORM: X86 + VSVER: 12 + - CMAKE_GENERATOR: "Visual Studio 12 Win64" + QT5: C:\Qt\5.5\msvc2013_64 + PLATFORM: X64 + VSVER: 12 + - CMAKE_GENERATOR: "Visual Studio 14" + QT5: C:\Qt\5.6\msvc2015 + PLATFORM: X86 + VSVER: 14 + - CMAKE_GENERATOR: "Visual Studio 14 Win64" + QT5: C:\Qt\5.6\msvc2015_64 + PLATFORM: X64 + VSVER: 14 + - CMAKE_GENERATOR: "NMake Makefiles JOM" + QT5: C:\Qt\5.5\msvc2013 + PLATFORM: X86 + VSVER: 12 + - CMAKE_GENERATOR: "NMake Makefiles JOM" + QT5: C:\Qt\5.5\msvc2013_64 + PLATFORM: X64 + VSVER: 12 + - CMAKE_GENERATOR: "NMake Makefiles JOM" + QT5: C:\Qt\5.6\msvc2015 + PLATFORM: X86 + VSVER: 14 + - CMAKE_GENERATOR: "NMake Makefiles JOM" + QT5: C:\Qt\5.6\msvc2015_64 + PLATFORM: X64 + VSVER: 14 + - CMAKE_GENERATOR: "MinGW Makefiles" + QT5: C:\Qt\5.5\mingw492_32 + MINGW_PATH: C:\Qt\Tools\mingw492_32 + - CMAKE_GENERATOR: "MinGW Makefiles" + QT5: C:\Qt\5.6\mingw49_32 + MINGW_PATH: C:\Qt\Tools\mingw492_32 + +before_build: + - set PATH=C:\cygwin\bin;%QT5%\bin;c:\dev\grantlee\build\templates\lib;c:\dev\grantlee\build\textdocument\lib;%PATH% + - sed -i "s|std::equal(b, e, lb)|std::equal(b, e,\n#if defined(Q_CC_MSVC)\nstdext::make_unchecked_array_iterator(lb)\n#else\nlb\n#endif\n)|" %QT5%\include\QtCore\qlist.h + - set PATH=%PATH:C:\cygwin\bin;=% + - if "%CMAKE_GENERATOR%" == "MinGW Makefiles" set PATH=%MINGW_PATH%\bin;%PATH:C:\Program Files\Git\usr\bin;=% + - if "%CMAKE_GENERATOR%" == "NMake Makefiles JOM" set PATH=C:\Qt\Tools\QtCreator\bin;%PATH% + - if "%CMAKE_GENERATOR%" == "Ninja" cinst ninja + - if "%CMAKE_GENERATOR%" == "Ninja" set PATH=C:\tools\ninja;%PATH% + #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + +build: + +build_script: + - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS")) + - if NOT "%CMAKE_GENERATOR%" == "MinGW Makefiles" echo "Using Visual Studio %VSVER%.0 at %VSCOMNTOOLS%" + - if "%CMAKE_GENERATOR%" == "MinGW Makefiles" echo "Using MinGW" + - if "%CMAKE_GENERATOR%" == "NMake Makefiles JOM" if "%PLATFORM%" == "X86" call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" + - if "%CMAKE_GENERATOR%" == "NMake Makefiles JOM" if "%PLATFORM%" == "X64" "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 + - if "%CMAKE_GENERATOR%" == "NMake Makefiles JOM" if "%PLATFORM%" == "X64" call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 + - if "%CMAKE_GENERATOR%" == "Ninja" if "%PLATFORM%" == "X86" call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" + - if "%CMAKE_GENERATOR%" == "Ninja" if "%PLATFORM%" == "X64" "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 + - if "%CMAKE_GENERATOR%" == "Ninja" if "%PLATFORM%" == "X64" call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 + - cd c:\dev\grantlee + - md build + - cd build + - cmake .. -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QT5%" + - cmake --build . --config Debug + - cmake --build . --config Release + +test_script: + - cmd: ctest --output-on-failure -C "Debug" + - cmd: ctest --output-on-failure -C "Release" diff -Nru grantlee5-5.0.0/CHANGELOG grantlee5-5.1.0/CHANGELOG --- grantlee5-5.0.0/CHANGELOG 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/CHANGELOG 2016-04-19 06:33:17.000000000 +0000 @@ -5,6 +5,15 @@ Version History --------------- +-- Version 5.1 -- +------------------- +* Implement advanced operators for the {% if %} tag +* Use 'd' postfix for plugins built in debug mode +* Use 'd' postfix for libraries built in debug mode by Visual Studio +* Make it possible to build without QtScript and QtLinguistTools +* Bump Grantlee CMake requirement to 3.1. +* Bump Grantlee Qt requirement to 5.3. + -- Version 5.0.0 -- ------------------- * Drop Qt 4 build. Make Qt 5 a hard requirement. diff -Nru grantlee5-5.0.0/.clang-format grantlee5-5.1.0/.clang-format --- grantlee5-5.0.0/.clang-format 1970-01-01 00:00:00.000000000 +0000 +++ grantlee5-5.1.0/.clang-format 2016-04-19 06:33:17.000000000 +0000 @@ -0,0 +1,7 @@ +BasedOnStyle: llvm +AccessModifierOffset: -2 +BreakBeforeBinaryOperators: true +ColumnLimit: 80 +Standard: Cpp11 +IndentWidth: 2 +BreakBeforeBraces: Linux diff -Nru grantlee5-5.0.0/cmake/modules/Doxyfile.in grantlee5-5.1.0/cmake/modules/Doxyfile.in --- grantlee5-5.0.0/cmake/modules/Doxyfile.in 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/cmake/modules/Doxyfile.in 2016-04-19 06:33:17.000000000 +0000 @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = Grantlee -PROJECT_NUMBER = @Grantlee_VERSION_MAJOR@.@Grantlee_VERSION_MINOR@.@Grantlee_VERSION_PATCH@ +PROJECT_NUMBER = @Grantlee5_VERSION_MAJOR@.@Grantlee5_VERSION_MINOR@.@Grantlee5_VERSION_PATCH@ OUTPUT_DIRECTORY = @DOCS_OUTPUT_DIRECTORY@ CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -160,9 +160,9 @@ # configuration options related to the Qt Docs output #--------------------------------------------------------------------------- GENERATE_QHP = @GENERATE_QHP@ -QHP_NAMESPACE = "org.grantlee.@Grantlee_VERSION_MAJOR@@Grantlee_VERSION_MINOR@@Grantlee_VERSION_PATCH@" -QHP_VIRTUAL_FOLDER = "grantlee-@Grantlee_VERSION_MAJOR@.@Grantlee_VERSION_MINOR@" -QCH_FILE = @CMAKE_BINARY_DIR@/"grantlee-@Grantlee_VERSION_MAJOR@@Grantlee_VERSION_MINOR@@Grantlee_VERSION_PATCH@.qch" +QHP_NAMESPACE = "org.grantlee.@Grantlee5_VERSION_MAJOR@@Grantlee5_VERSION_MINOR@@Grantlee5_VERSION_PATCH@" +QHP_VIRTUAL_FOLDER = "grantlee-@Grantlee5_VERSION_MAJOR@.@Grantlee5_VERSION_MINOR@" +QCH_FILE = @CMAKE_BINARY_DIR@/"grantlee-@Grantlee5_VERSION_MAJOR@@Grantlee5_VERSION_MINOR@@Grantlee5_VERSION_PATCH@.qch" QHG_LOCATION = "qhelpgenerator" #--------------------------------------------------------------------------- # configuration options related to the LaTeX output diff -Nru grantlee5-5.0.0/cmake/modules/Grantlee5Config.cmake.in grantlee5-5.1.0/cmake/modules/Grantlee5Config.cmake.in --- grantlee5-5.0.0/cmake/modules/Grantlee5Config.cmake.in 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/cmake/modules/Grantlee5Config.cmake.in 2016-04-19 06:33:17.000000000 +0000 @@ -2,8 +2,8 @@ # Any changes in this file will be overwritten by CMake. -if (Grantlee@Grantlee_VERSION_MAJOR@_FIND_COMPONENTS) - foreach( component ${Grantlee@Grantlee_VERSION_MAJOR@_FIND_COMPONENTS}) +if (Grantlee@Grantlee5_VERSION_MAJOR@_FIND_COMPONENTS) + foreach( component ${Grantlee@Grantlee5_VERSION_MAJOR@_FIND_COMPONENTS}) if (component STREQUAL "Textdocument") set(RequiredQtComponents ${RequiredQtComponents} Gui) endif() diff -Nru grantlee5-5.0.0/cmake/modules/GrantleeMacros.cmake grantlee5-5.1.0/cmake/modules/GrantleeMacros.cmake --- grantlee5-5.0.0/cmake/modules/GrantleeMacros.cmake 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/cmake/modules/GrantleeMacros.cmake 2016-04-19 06:33:17.000000000 +0000 @@ -4,7 +4,16 @@ macro(grantlee_adjust_plugin_name pluginname) set_target_properties(${pluginname} PROPERTIES PREFIX "" - LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR}" - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR}" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" + DEBUG_POSTFIX "d" ) + foreach(cfg ${CMAKE_CONFIGURATION_TYPES}) + string(TOUPPER ${cfg} CFG) + set_target_properties(${pluginname} + PROPERTIES + LIBRARY_OUTPUT_DIRECTORY_${CFG} "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" + RUNTIME_OUTPUT_DIRECTORY_${CFG} "${CMAKE_BINARY_DIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" + ) + endforeach() endmacro() diff -Nru grantlee5-5.0.0/CMakeLists.txt grantlee5-5.1.0/CMakeLists.txt --- grantlee5-5.0.0/CMakeLists.txt 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/CMakeLists.txt 2016-04-19 06:33:17.000000000 +0000 @@ -1,5 +1,9 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.1) + +if (POLICY CMP0063) + cmake_policy(SET CMP0063 NEW) +endif() project(Grantlee) @@ -30,23 +34,25 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) -# create coverage build type -set(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} Coverage ) -if (${CMAKE_VERSION} VERSION_GREATER 2.8.2 AND CMAKE_GENERATOR STREQUAL "Unix Makefiles") +if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") + # create coverage build type + set(CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} Coverage ) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo" "Coverage" "TestCocoon") endif() -set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") -set(CMAKE_C_FLAGS_COVERAGE "${CMAKE_C_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") -set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") - -set(TESTCOCOON_ARGS "--cs-on --cs-count --cs-include-file-abs-regex=${CMAKE_SOURCE_DIR}/.* --cs-include-file-regex=qrc_* --cs-qt4 --cs-exclude-file-abs-regex=${CMAKE_BINARY_DIR}/.*") -set(CMAKE_CXX_FLAGS_TESTCOCOON "${CMAKE_CXX_FLAGS_RELEASE} ${TESTCOCOON_ARGS}") -set(CMAKE_C_FLAGS_TESTCOCOON "${CMAKE_C_FLAGS_RELEASE} ${TESTCOCOON_ARGS}") -set(CMAKE_EXE_LINKER_FLAGS_TESTCOCOON "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${TESTCOCOON_ARGS}") -set(CMAKE_SHARED_LINKER_FLAGS_TESTCOCOON "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${TESTCOCOON_ARGS}") -set(CMAKE_STATIC_LINKER_FLAGS_TESTCOCOON "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} ${TESTCOCOON_ARGS}") +if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") + set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") + set(CMAKE_C_FLAGS_COVERAGE "${CMAKE_C_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") + set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") + + set(TESTCOCOON_ARGS "--cs-on --cs-count --cs-include-file-abs-regex=${CMAKE_SOURCE_DIR}/.* --cs-include-file-regex=qrc_* --cs-qt4 --cs-exclude-file-abs-regex=${CMAKE_BINARY_DIR}/.*") + set(CMAKE_CXX_FLAGS_TESTCOCOON "${CMAKE_CXX_FLAGS_RELEASE} ${TESTCOCOON_ARGS}") + set(CMAKE_C_FLAGS_TESTCOCOON "${CMAKE_C_FLAGS_RELEASE} ${TESTCOCOON_ARGS}") + set(CMAKE_EXE_LINKER_FLAGS_TESTCOCOON "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${TESTCOCOON_ARGS}") + set(CMAKE_SHARED_LINKER_FLAGS_TESTCOCOON "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${TESTCOCOON_ARGS}") + set(CMAKE_STATIC_LINKER_FLAGS_TESTCOCOON "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} ${TESTCOCOON_ARGS}") +endif() if (CMAKE_COMPILER_IS_GNUCXX) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") @@ -81,18 +87,18 @@ set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) set(CMAKE_AUTOMOC ON) -set(Grantlee_VERSION_MAJOR 5) -set(Grantlee_VERSION_MINOR 0) -set(Grantlee_VERSION_PATCH 0) -set(Grantlee_MIN_PLUGIN_VERSION 0) +set(Grantlee5_VERSION_MAJOR 5) +set(Grantlee5_VERSION_MINOR 1) +set(Grantlee5_VERSION_PATCH 0) +set(Grantlee5_MIN_PLUGIN_VERSION 0) -set(Grantlee_MAJOR_MINOR_VERSION_STRING "${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR}" ) -set(Grantlee_VERSION_STRING "${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR}.${Grantlee_VERSION_PATCH}" ) +set(Grantlee5_MAJOR_MINOR_VERSION_STRING "${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" ) +set(Grantlee5_VERSION_STRING "${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}.${Grantlee5_VERSION_PATCH}" ) set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '64')") set( LIB_INSTALL_DIR lib${LIB_SUFFIX} ) -set( PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/grantlee/${Grantlee_MAJOR_MINOR_VERSION_STRING} ) +set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} ) set( BIN_INSTALL_DIR bin ) set( INCLUDE_INSTALL_DIR include ) set( DATA_INSTALL_DIR share/apps ) @@ -111,23 +117,23 @@ add_subdirectory(textdocument) endif() -set(CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/Grantlee${Grantlee_VERSION_MAJOR}" ) +set(CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/Grantlee${Grantlee5_VERSION_MAJOR}" ) configure_file( - "${Grantlee_MODULE_DIR}/Grantlee${Grantlee_VERSION_MAJOR}Config.cmake.in" - "${Grantlee_BINARY_DIR}/Grantlee${Grantlee_VERSION_MAJOR}Config.cmake" + "${Grantlee_MODULE_DIR}/Grantlee${Grantlee5_VERSION_MAJOR}Config.cmake.in" + "${Grantlee_BINARY_DIR}/Grantlee${Grantlee5_VERSION_MAJOR}Config.cmake" @ONLY ) include(CMakePackageConfigHelpers) -write_basic_package_version_file("${Grantlee_BINARY_DIR}/Grantlee${Grantlee_VERSION_MAJOR}ConfigVersion.cmake" - VERSION ${Grantlee_VERSION_STRING} +write_basic_package_version_file("${Grantlee_BINARY_DIR}/Grantlee${Grantlee5_VERSION_MAJOR}ConfigVersion.cmake" + VERSION ${Grantlee5_VERSION_STRING} COMPATIBILITY AnyNewerVersion ) install(FILES - "${Grantlee_BINARY_DIR}/Grantlee${Grantlee_VERSION_MAJOR}Config.cmake" - "${Grantlee_BINARY_DIR}/Grantlee${Grantlee_VERSION_MAJOR}ConfigVersion.cmake" + "${Grantlee_BINARY_DIR}/Grantlee${Grantlee5_VERSION_MAJOR}Config.cmake" + "${Grantlee_BINARY_DIR}/Grantlee${Grantlee5_VERSION_MAJOR}ConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Common ) @@ -140,7 +146,7 @@ install(EXPORT grantlee_targets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - NAMESPACE Grantlee${Grantlee_VERSION_MAJOR}:: + NAMESPACE Grantlee${Grantlee5_VERSION_MAJOR}:: FILE GrantleeTargets.cmake COMPONENT Common ) @@ -245,7 +251,7 @@ ) list(APPEND coverage_ARGS COMMAND ${CMAKE_COMMAND} -E remove_directory coverage) - list(APPEND coverage_ARGS COMMAND ${GENHTML_EXECUTABLE} -o coverage/ -s --demangle-cpp -f test_all.info) + list(APPEND coverage_ARGS COMMAND ${GENHTML_EXECUTABLE} -o coverage/ -s --demangle-cpp -f test_all.info --prefix ${CMAKE_SOURCE_DIR}) add_custom_target(coverage ${coverage_ARGS} @@ -343,13 +349,13 @@ # http://www.vtk.org/Wiki/CMake:Component_Install_With_CPack set(CPACK_PACKAGE_NAME "grantlee") -set(CPACK_PACKAGE_VERSION_MAJOR ${Grantlee_VERSION_MAJOR}) -set(CPACK_PACKAGE_VERSION_MINOR ${Grantlee_VERSION_MINOR}) -set(CPACK_PACKAGE_VERSION_PATCH ${Grantlee_VERSION_PATCH}) +set(CPACK_PACKAGE_VERSION_MAJOR ${Grantlee5_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${Grantlee5_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${Grantlee5_VERSION_PATCH}) set(CPACK_PACKAGE_CONTACT "Stephen Kelly ") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A set of frameworks for use with Qt") set(CPACK_GENERATOR "TGZ" ) -set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README") +set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.LIB") set(CPACK_COMPONENT_COMMON_DISPLAY_NAME "Grantlee Common files") diff -Nru grantlee5-5.0.0/debian/changelog grantlee5-5.1.0/debian/changelog --- grantlee5-5.0.0/debian/changelog 2015-08-13 23:05:04.000000000 +0000 +++ grantlee5-5.1.0/debian/changelog 2016-10-24 09:35:52.000000000 +0000 @@ -1,30 +1,48 @@ -grantlee5 (5.0.0-0ubuntu4) wily; urgency=medium +grantlee5 (5.1.0-2) unstable; urgency=medium - * Add conflicts on libgrantlee-dev + [ Helmut Grohne ] + * Avoid calling xvfb-run on cross builds when DEB_BUILD_OPTIONS=nocheck is + set (Closes: 839394) - -- Jonathan Riddell Fri, 14 Aug 2015 00:04:55 +0100 + -- Maximiliano Curia Mon, 24 Oct 2016 11:35:52 +0200 -grantlee5 (5.0.0-0ubuntu3) vivid; urgency=medium +grantlee5 (5.1.0-1) unstable; urgency=medium - * Add build-dep on qttools5-dev-tools + * New upstream release (5.1.0) (Closes: #828881) + * Update copyright information + * Bump Standards-Version to 3.9.8 + * Update build-deps and deps with the info from cmake + * Migrate dbg package to automatic dbgsym + * Update symbols files - -- Jonathan Riddell Mon, 08 Dec 2014 21:30:59 +0100 + -- Maximiliano Curia Thu, 30 Jun 2016 10:47:48 +0200 -grantlee5 (5.0.0-0ubuntu2) vivid; urgency=medium +grantlee5 (5.0.0-3) unstable; urgency=medium - * Add build-dep on qtscript5-dev + * Update symbols files from buildds logs (5.0.0-2). - -- Jonathan Riddell Mon, 08 Dec 2014 20:47:42 +0100 + -- Maximiliano Curia Sun, 30 Aug 2015 08:58:21 +0200 -grantlee5 (5.0.0-0ubuntu1) vivid; urgency=medium +grantlee5 (5.0.0-2) unstable; urgency=medium - * New upstream release - * Update package for Qt 5 version: - - rename source - - new binary package names - - Update build-depends to Qt 5 + * Update symbols files. + + -- Maximiliano Curia Fri, 07 Aug 2015 12:46:38 +0200 + +grantlee5 (5.0.0-1) unstable; urgency=medium - -- Daniel Pastushchak Fri, 05 Dec 2014 20:04:36 +0300 + * New upstream release (5.0.0). + * Update copyright information. + * Add symbols files. + * Drop boost build dep, only needed for the tests in solaris. + + -- Maximiliano Curia Tue, 07 Jul 2015 23:00:17 +0200 + +grantlee (0.4.0-3) unstable; urgency=medium + + * Update symbols files. (Closes: #777889) + + -- Maximiliano Curia Thu, 06 Aug 2015 16:58:43 +0200 grantlee (0.4.0-2) unstable; urgency=medium @@ -117,7 +135,7 @@ grantlee (0.1.7-1) unstable; urgency=low - * New upstream release + * New upstream release * Set compat level to 7 * Include cdbs util.mk in rules to check missing files * Enable DEB_BUILD_PARALLEL @@ -128,4 +146,4 @@ * Initial release - -- Bjoern Ricks Thu, 29 Jul 2010 10:30:08 +0200 + -- Bjoern Ricks Thu, 29 Jul 2010 10:30:08 +0200 diff -Nru grantlee5-5.0.0/debian/control grantlee5-5.1.0/debian/control --- grantlee5-5.0.0/debian/control 2015-08-13 23:03:11.000000000 +0000 +++ grantlee5-5.1.0/debian/control 2016-10-24 09:35:52.000000000 +0000 @@ -1,70 +1,59 @@ Source: grantlee5 Section: libs Priority: optional -Maintainer: Kubuntu Developers -XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Maintainer: Debian Krap Maintainers Uploaders: Bjoern Ricks , Sune Vuorela , Maximiliano Curia , Pino Toscano -Build-Depends: cmake (>= 2.8.9), +Build-Depends: cccc, + cmake (>= 3.1~), debhelper (>= 9), + lcov, + libboost-dev, pkg-kde-tools, - qtbase5-dev, - qtscript5-dev, - qttools5-dev, - qttools5-dev-tools, + qtbase5-dev (>= 5.4), + qtscript5-dev (>= 5.4), + qttools5-dev (>= 5.4), + qttools5-dev-tools (>= 5.4), xauth, xvfb -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: http://www.grantlee.org/ -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/krap/grantlee.git/ +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/krap/grantlee.git Vcs-Git: git://anonscm.debian.org/pkg-kde/krap/grantlee.git Package: libgrantlee-textdocument5 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Description: Grantlee templating library for Qt - GUI +Description: Grantlee templating library for Qt - TextDocument Grantlee is a string template engine based on the Django template system and written in Qt. . - This package contains the GUI part of Grantlee. + This package contains the TextDocument Grantlee library. Package: libgrantlee-templates5 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Description: Grantlee templating library for Qt - Core +Description: Grantlee templating library for Qt - Templates Grantlee is a string template engine based on the Django template system and written in Qt. . - This package contains the core Grantlee library. It also includes the - standard tag and filter plugins. + This package contains the Templates Grantlee library. It also contains the + standard plugins. Package: libgrantlee5-dev Section: libdevel Architecture: any Depends: libgrantlee-templates5 (= ${binary:Version}), libgrantlee-textdocument5 (= ${binary:Version}), - qtbase5-dev, + qtbase5-dev (>= 5.4), ${misc:Depends} -Conflicts: libgrantlee-dev +Breaks: libgrantlee-dev (<= 5~) +Replaces: libgrantlee-dev (<= 5~) Description: Grantlee templating library development files Grantlee is a string template engine based on the Django template system and written in Qt. . This package contains the development files for building applications using grantlee. - -Package: grantlee5-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libgrantlee-templates5 (= ${binary:Version}) | libgrantlee-textdocument5 (= ${binary:Version}), - ${misc:Depends} -Suggests: qtbase5-dbg -Description: Grantlee templating library (debugging symbols) - Grantlee is a string template engine based on the Django template system - and written in Qt. - . - This package contains the debugging symbols used to investigate issues in - Grantlee. diff -Nru grantlee5-5.0.0/debian/copyright grantlee5-5.1.0/debian/copyright --- grantlee5-5.0.0/debian/copyright 2014-12-08 20:30:53.000000000 +0000 +++ grantlee5-5.1.0/debian/copyright 2016-10-24 09:35:52.000000000 +0000 @@ -3,8 +3,9 @@ Source: http://downloads.grantlee.org Files: * -Copyright: 2008-2011, Stephen Kelly +Copyright: 1991-1999, Free Software Foundation, Inc 2010, Michael Jansen + 2008-2016, Stephen Kelly License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -22,12 +23,12 @@ On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. -Files: templates/i18n/i18nc.cpp +Files: templates/i18n/i18n.cpp + templates/i18n/i18n.h + templates/i18n/i18nc.cpp templates/i18n/i18nc.h templates/i18n/i18ncp.cpp templates/i18n/i18ncp.h - templates/i18n/i18n.cpp - templates/i18n/i18n.h templates/i18n/i18np.cpp templates/i18n/i18np.h templates/i18n/i18ntags.cpp @@ -52,20 +53,25 @@ On Debian systems, the complete text of the GNU Lesser General Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'. -Files: examples/contacts/cmake/modules/FindGettext.cmake -Copyright: 2006, Chusslove Illich -License: BSD-3-clause +Files: examples/codegen/templates/cpp/bsd.h + examples/codegen/templates/py/bsd.py + examples/codegen/templates/rb/bsd.rb + scripts/extract_strings_gettext.py + scripts/extract_strings_linguist.py + scripts/strings_extractor_gettext.py + scripts/strings_extractor_linguist.py + scripts/updatelicence.py +Copyright: 2010-2011 Stephen Kelly +License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . - 1. Redistributions of source code must retain the copyright + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the copyright + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -84,12 +90,8 @@ examples/books/bookwindow.h examples/books/initdb.h examples/books/main.cpp - examples/textedit/main.cpp - examples/textedit/textedit.cpp - examples/textedit/textedit.h - examples/textedit/textedit.qdoc Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies) -License: LGPL-2+ or GPL-3+ +License: GPL-3_or_LGPL-2.1-QTexception-1.0 No Commercial Usage This file contains pre-release code and may not be distributed. You may use this file in accordance with the terms and conditions @@ -126,45 +128,64 @@ On Debian systems, the complete text of the GNU General Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. -Files: examples/htmlapps/templates/shared/jquery-2.0.3.js -Copyright: 2005, 2013 jQuery Foundation, Inc. and other contributors -License: MIT - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: +Files: examples/textedit/main.cpp + examples/textedit/textedit.cpp + examples/textedit/textedit.h + examples/textedit/textedit.qdoc +Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies) +License: GPL-3_or_LGPL-2.1-QTexception-1.1 + Commercial Usage + Licensees holding valid Qt Commercial licenses may use this file in + accordance with the Qt Commercial License Agreement provided with the + Software or, alternatively, in accordance with the terms contained in + a written agreement between you and Nokia. . - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. + GNU Lesser General Public License Usage + Alternatively, this file may be used under the terms of the GNU Lesser + General Public License version 2.1 as published by the Free Software + Foundation and appearing in the file LICENSE.LGPL included in the + packaging of this file. Please review the following information to + ensure the GNU Lesser General Public License version 2.1 requirements + will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + In addition, as a special exception, Nokia gives you certain additional + rights. These rights are described in the Nokia Qt LGPL Exception + version 1.1, included in the file LGPL_EXCEPTION.txt in this package. + . + GNU General Public License Usage + Alternatively, this file may be used under the terms of the GNU + General Public License version 3.0 as published by the Free Software + Foundation and appearing in the file LICENSE.GPL included in the + packaging of this file. Please review the following information to + ensure the GNU General Public License version 3.0 requirements will be + met: http://www.gnu.org/copyleft/gpl.html. + . + If you have questions regarding the use of this file, please contact + Nokia at qt-info@nokia.com. + . + On Debian systems, the complete text of the GNU Lesser General Public License + version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. + . + On Debian systems, the complete text of the GNU General Public License + version 3 can be found in `/usr/share/common-licenses/GPL-3'. -Files: scripts/extract_strings_gettext.py - scripts/extract_strings_linguist.py - scripts/strings_extractor_gettext.p - scripts/strings_extractor_linguist.py +Files: examples/contacts/cmake/modules/FindGettext.cmake scripts/strings_extractor.py - scripts/updatelicence.py -Copyright: 2010-2011 Stephen Kelly -License: BSD-2-clause +Copyright: 2006, Chusslove Illich + Django Software Foundation and individual contributors + 2010-2011, Stephen Kelly +License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . - 1. Redistributions of source code must retain the above copyright + 1. Redistributions of source code must retain the copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright + 2. Redistributions in binary form must reproduce the copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -177,6 +198,28 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Files: examples/htmlapps/templates/shared/jquery-2.0.3.js +Copyright: 2005, 2013 jQuery Foundation, Inc. and other contributors +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + Files: debian/* Copyright: 2010, Debian Qt/KDE Maintainers License: GPL-2 diff -Nru grantlee5-5.0.0/debian/libgrantlee5-dev.install grantlee5-5.1.0/debian/libgrantlee5-dev.install --- grantlee5-5.0.0/debian/libgrantlee5-dev.install 2014-12-08 20:30:53.000000000 +0000 +++ grantlee5-5.1.0/debian/libgrantlee5-dev.install 2016-10-24 09:35:52.000000000 +0000 @@ -1,11 +1,6 @@ - usr/include/grantlee/ usr/include/grantlee_templates.h usr/include/grantlee_textdocument.h -usr/lib/cmake/Grantlee5/Grantlee5Config.cmake -usr/lib/cmake/Grantlee5/Grantlee5ConfigVersion.cmake -usr/lib/cmake/Grantlee5/GrantleeMacros.cmake -usr/lib/cmake/Grantlee5/GrantleeTargets-none.cmake -usr/lib/cmake/Grantlee5/GrantleeTargets.cmake -usr/lib/libGrantlee_Templates.so -usr/lib/libGrantlee_TextDocument.so +usr/lib/*/cmake/Grantlee5/ +usr/lib/*/libGrantlee_Templates.so +usr/lib/*/libGrantlee_TextDocument.so diff -Nru grantlee5-5.0.0/debian/libgrantlee-templates5.install grantlee5-5.1.0/debian/libgrantlee-templates5.install --- grantlee5-5.0.0/debian/libgrantlee-templates5.install 2014-12-08 20:30:53.000000000 +0000 +++ grantlee5-5.1.0/debian/libgrantlee-templates5.install 2016-10-24 09:35:52.000000000 +0000 @@ -1,6 +1,3 @@ -usr/lib/grantlee/5.0/grantlee_defaultfilters.so -usr/lib/grantlee/5.0/grantlee_defaulttags.so -usr/lib/grantlee/5.0/grantlee_i18ntags.so -usr/lib/grantlee/5.0/grantlee_loadertags.so -usr/lib/libGrantlee_Templates.so.5 -usr/lib/libGrantlee_Templates.so.5.0.0 +usr/lib/*/grantlee/ +usr/lib/*/libGrantlee_Templates.so.5 +usr/lib/*/libGrantlee_Templates.so.5.* diff -Nru grantlee5-5.0.0/debian/libgrantlee-templates5.symbols grantlee5-5.1.0/debian/libgrantlee-templates5.symbols --- grantlee5-5.0.0/debian/libgrantlee-templates5.symbols 1970-01-01 00:00:00.000000000 +0000 +++ grantlee5-5.1.0/debian/libgrantlee-templates5.symbols 2016-10-24 09:35:52.000000000 +0000 @@ -0,0 +1,456 @@ +# SymbolsHelper-Confirmed: 5.1.0 amd64 +libGrantlee_Templates.so.5 libgrantlee-templates5 #MINVER# + _ZN8Grantlee10SafeString12NestedString10push_frontERKS0_@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString10setUnicodeEPK5QChari@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString4chopEi@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString4fillE5QChari@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6appendE5QChar@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6appendERK10QStringRef@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6appendERK13QLatin1String@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6appendERK7QString@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6appendERKS0_@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6insertEi5QChar@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6insertEiPK5QChari@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6insertEiRK13QLatin1String@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6insertEiRK7QString@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6insertEiRKS0_@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6removeE5QCharN2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6removeERK18QRegularExpression@Base 5.1.0 + _ZN8Grantlee10SafeString12NestedString6removeERK7QStringN2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6removeERKS0_N2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6removeEii@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6setNumEdci@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6setNumEfci@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6setNumEii@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6setNumEji@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6setNumEli@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6setNumEmi@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6setNumEsi@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6setNumEti@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6setNumExi@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString6setNumEyi@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7prependE5QChar@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7prependERK13QLatin1String@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7prependERK7QString@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7prependERKS0_@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceE5QCharRK13QLatin1StringN2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceE5QCharRK7QStringN2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceE5QCharRKS0_N2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceE5QCharS2_N2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceEPK5QChariS4_iN2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceERK13QLatin1StringRK7QStringN2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceERK13QLatin1StringRKS0_N2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceERK13QLatin1StringS4_N2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceERK18QRegularExpressionRK7QString@Base 5.1.0 + _ZN8Grantlee10SafeString12NestedString7replaceERK18QRegularExpressionRKS0_@Base 5.1.0 + _ZN8Grantlee10SafeString12NestedString7replaceERK7QStringRK13QLatin1StringN2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceERK7QStringRKS0_N2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceERK7QStringS4_N2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceERKS0_RK13QLatin1StringN2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceERKS0_RK7QStringN2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceERKS0_S3_N2Qt15CaseSensitivityE@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceEii5QChar@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceEiiPK5QChari@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceEiiRK7QString@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString7replaceEiiRKS0_@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString8setUtf16EPKti@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedString9push_backERKS0_@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedStringC1EPS0_@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedStringC1ERK7QStringPS0_@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedStringC2EPS0_@Base 5.0.0 + _ZN8Grantlee10SafeString12NestedStringC2ERK7QStringPS0_@Base 5.0.0 + _ZN8Grantlee10SafeString14setNeedsEscapeEb@Base 5.0.0 + _ZN8Grantlee10SafeString9setSafetyENS0_6SafetyE@Base 5.0.0 + _ZN8Grantlee10SafeStringC1ERK7QStringNS0_6SafetyE@Base 5.0.0 + _ZN8Grantlee10SafeStringC1ERK7QStringb@Base 5.0.0 + _ZN8Grantlee10SafeStringC1ERKS0_@Base 5.0.0 + _ZN8Grantlee10SafeStringC1Ev@Base 5.0.0 + _ZN8Grantlee10SafeStringC2ERK7QStringNS0_6SafetyE@Base 5.0.0 + _ZN8Grantlee10SafeStringC2ERK7QStringb@Base 5.0.0 + _ZN8Grantlee10SafeStringC2ERKS0_@Base 5.0.0 + _ZN8Grantlee10SafeStringC2Ev@Base 5.0.0 + _ZN8Grantlee10SafeStringD1Ev@Base 5.0.0 + _ZN8Grantlee10SafeStringD2Ev@Base 5.0.0 + _ZN8Grantlee10SafeStringaSERKS0_@Base 5.0.0 + _ZN8Grantlee10SafeStringpLERK7QString@Base 5.0.0 + _ZN8Grantlee10SafeStringpLERKS0_@Base 5.0.0 + _ZN8Grantlee10SafeStringplERK7QString@Base 5.0.0 + _ZN8Grantlee10SafeStringplERKS0_@Base 5.0.0 + _ZN8Grantlee11QtLocalizer10pushLocaleERK7QString@Base 5.0.0 + _ZN8Grantlee11QtLocalizer11loadCatalogERK7QStringS3_@Base 5.0.0 + _ZN8Grantlee11QtLocalizer13unloadCatalogERK7QString@Base 5.0.0 + _ZN8Grantlee11QtLocalizer17installTranslatorEP11QTranslatorRK7QString@Base 5.0.0 + _ZN8Grantlee11QtLocalizer20setAppTranslatorPathERK7QString@Base 5.0.0 + _ZN8Grantlee11QtLocalizer22setAppTranslatorPrefixERK7QString@Base 5.0.0 + _ZN8Grantlee11QtLocalizer9popLocaleEv@Base 5.0.0 + _ZN8Grantlee11QtLocalizerC1ERK7QLocale@Base 5.0.0 + _ZN8Grantlee11QtLocalizerC2ERK7QLocale@Base 5.0.0 + _ZN8Grantlee11QtLocalizerD0Ev@Base 5.0.0 + _ZN8Grantlee11QtLocalizerD1Ev@Base 5.0.0 + _ZN8Grantlee11QtLocalizerD2Ev@Base 5.0.0 + _ZN8Grantlee12OutputStreamC1EP11QTextStream@Base 5.0.0 + _ZN8Grantlee12OutputStreamC1Ev@Base 5.0.0 + _ZN8Grantlee12OutputStreamC2EP11QTextStream@Base 5.0.0 + _ZN8Grantlee12OutputStreamC2Ev@Base 5.0.0 + _ZN8Grantlee12OutputStreamD0Ev@Base 5.0.0 + _ZN8Grantlee12OutputStreamD1Ev@Base 5.0.0 + _ZN8Grantlee12OutputStreamD2Ev@Base 5.0.0 + _ZN8Grantlee12OutputStreamlsEP11QTextStream@Base 5.0.0 + _ZN8Grantlee12OutputStreamlsERK7QString@Base 5.0.0 + _ZN8Grantlee12OutputStreamlsERKNS_10SafeStringE@Base 5.0.0 + _ZN8Grantlee12TemplateImpl10setContentERK7QString@Base 5.0.0 + _ZN8Grantlee12TemplateImpl11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.0 + _ZN8Grantlee12TemplateImpl11qt_metacastEPKc@Base 5.0.0 + _ZN8Grantlee12TemplateImpl11setNodeListERKNS_8NodeListE@Base 5.0.0 + _ZN8Grantlee12TemplateImpl16staticMetaObjectE@Base 5.0.0 + _ZN8Grantlee12TemplateImplC1EPKNS_6EngineEP7QObject@Base 5.0.0 + _ZN8Grantlee12TemplateImplC1EPKNS_6EngineEbP7QObject@Base 5.0.0 + _ZN8Grantlee12TemplateImplC2EPKNS_6EngineEP7QObject@Base 5.0.0 + _ZN8Grantlee12TemplateImplC2EPKNS_6EngineEbP7QObject@Base 5.0.0 + _ZN8Grantlee12TemplateImplD0Ev@Base 5.0.0 + _ZN8Grantlee12TemplateImplD1Ev@Base 5.0.0 + _ZN8Grantlee12TemplateImplD2Ev@Base 5.0.0 + _ZN8Grantlee12VariableNode11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.0 + _ZN8Grantlee12VariableNode11qt_metacastEPKc@Base 5.0.0 + _ZN8Grantlee12VariableNode16staticMetaObjectE@Base 5.0.0 + _ZN8Grantlee12VariableNodeC1ERKNS_16FilterExpressionEP7QObject@Base 5.0.0 + _ZN8Grantlee12VariableNodeC2ERKNS_16FilterExpressionEP7QObject@Base 5.0.0 + _ZN8Grantlee12isSafeStringERK8QVariant@Base 5.0.0 + _ZN8Grantlee13NullLocalizer10pushLocaleERK7QString@Base 5.0.0 + _ZN8Grantlee13NullLocalizer11loadCatalogERK7QStringS3_@Base 5.0.0 + _ZN8Grantlee13NullLocalizer13unloadCatalogERK7QString@Base 5.0.0 + _ZN8Grantlee13NullLocalizer9popLocaleEv@Base 5.0.0 + _ZN8Grantlee13NullLocalizerC1Ev@Base 5.0.0 + _ZN8Grantlee13NullLocalizerC2Ev@Base 5.0.0 + _ZN8Grantlee13NullLocalizerD0Ev@Base 5.0.0 + _ZN8Grantlee13NullLocalizerD1Ev@Base 5.0.0 + _ZN8Grantlee13NullLocalizerD2Ev@Base 5.0.0 + _ZN8Grantlee13RenderContext3popEv@Base 5.0.0 + _ZN8Grantlee13RenderContext4dataEPKNS_4NodeE@Base 5.0.0 + _ZN8Grantlee13RenderContext4pushEv@Base 5.0.0 + _ZN8Grantlee13RenderContextC1Ev@Base 5.0.0 + _ZN8Grantlee13RenderContextC2Ev@Base 5.0.0 + _ZN8Grantlee13RenderContextD1Ev@Base 5.0.0 + _ZN8Grantlee13RenderContextD2Ev@Base 5.0.0 + _ZN8Grantlee13getSafeStringERK8QVariant@Base 5.0.0 + _ZN8Grantlee13variantIsTrueERK8QVariant@Base 5.0.0 + _ZN8Grantlee15markForEscapingERKNS_10SafeStringE@Base 5.0.0 + _ZN8Grantlee16FilterExpressionC1ERK7QStringPNS_6ParserE@Base 5.0.0 + _ZN8Grantlee16FilterExpressionC1ERKS0_@Base 5.0.0 + _ZN8Grantlee16FilterExpressionC1Ev@Base 5.0.0 + _ZN8Grantlee16FilterExpressionC2ERK7QStringPNS_6ParserE@Base 5.0.0 + _ZN8Grantlee16FilterExpressionC2ERKS0_@Base 5.0.0 + _ZN8Grantlee16FilterExpressionC2Ev@Base 5.0.0 + _ZN8Grantlee16FilterExpressionD1Ev@Base 5.0.0 + _ZN8Grantlee16FilterExpressionD2Ev@Base 5.0.0 + _ZN8Grantlee16FilterExpressionaSERKS0_@Base 5.0.0 + _ZN8Grantlee17AbstractLocalizerC1Ev@Base 5.0.0 + _ZN8Grantlee17AbstractLocalizerC2Ev@Base 5.0.0 + _ZN8Grantlee17AbstractLocalizerD0Ev@Base 5.0.0 + _ZN8Grantlee17AbstractLocalizerD1Ev@Base 5.0.0 + _ZN8Grantlee17AbstractLocalizerD2Ev@Base 5.0.0 + _ZN8Grantlee19AbstractNodeFactory11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.0 + _ZN8Grantlee19AbstractNodeFactory11qt_metacastEPKc@Base 5.0.0 + _ZN8Grantlee19AbstractNodeFactory16staticMetaObjectE@Base 5.0.0 + _ZN8Grantlee19AbstractNodeFactoryC1EP7QObject@Base 5.0.0 + _ZN8Grantlee19AbstractNodeFactoryC2EP7QObject@Base 5.0.0 + _ZN8Grantlee19AbstractNodeFactoryD0Ev@Base 5.0.0 + _ZN8Grantlee19AbstractNodeFactoryD1Ev@Base 5.0.0 + _ZN8Grantlee19AbstractNodeFactoryD2Ev@Base 5.0.0 + _ZN8Grantlee19supportedOutputTypeERK8QVariant@Base 5.0.0 + _ZN8Grantlee21unescapeStringLiteralERK7QString@Base 5.0.0 + _ZN8Grantlee22AbstractTemplateLoaderD0Ev@Base 5.0.0 + _ZN8Grantlee22AbstractTemplateLoaderD1Ev@Base 5.0.0 + _ZN8Grantlee22AbstractTemplateLoaderD2Ev@Base 5.0.0 + _ZN8Grantlee22CachingLoaderDecorator5clearEv@Base 5.0.0 + _ZN8Grantlee22CachingLoaderDecoratorC1E14QSharedPointerINS_22AbstractTemplateLoaderEE@Base 5.0.0 + _ZN8Grantlee22CachingLoaderDecoratorC2E14QSharedPointerINS_22AbstractTemplateLoaderEE@Base 5.0.0 + _ZN8Grantlee22CachingLoaderDecoratorD0Ev@Base 5.0.0 + _ZN8Grantlee22CachingLoaderDecoratorD1Ev@Base 5.0.0 + _ZN8Grantlee22CachingLoaderDecoratorD2Ev@Base 5.0.0 + _ZN8Grantlee22InMemoryTemplateLoader11setTemplateERK7QStringS3_@Base 5.0.0 + _ZN8Grantlee22InMemoryTemplateLoaderC1Ev@Base 5.0.0 + _ZN8Grantlee22InMemoryTemplateLoaderC2Ev@Base 5.0.0 + _ZN8Grantlee22InMemoryTemplateLoaderD0Ev@Base 5.0.0 + _ZN8Grantlee22InMemoryTemplateLoaderD1Ev@Base 5.0.0 + _ZN8Grantlee22InMemoryTemplateLoaderD2Ev@Base 5.0.0 + _ZN8Grantlee24FileSystemTemplateLoader15setTemplateDirsERK11QStringList@Base 5.0.0 + _ZN8Grantlee24FileSystemTemplateLoader8setThemeERK7QString@Base 5.0.0 + _ZN8Grantlee24FileSystemTemplateLoaderC1E14QSharedPointerINS_17AbstractLocalizerEE@Base 5.0.0 + _ZN8Grantlee24FileSystemTemplateLoaderC2E14QSharedPointerINS_17AbstractLocalizerEE@Base 5.0.0 + _ZN8Grantlee24FileSystemTemplateLoaderD0Ev@Base 5.0.0 + _ZN8Grantlee24FileSystemTemplateLoaderD1Ev@Base 5.0.0 + _ZN8Grantlee24FileSystemTemplateLoaderD2Ev@Base 5.0.0 + _ZN8Grantlee4Node11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.0 + _ZN8Grantlee4Node11qt_metacastEPKc@Base 5.0.0 + _ZN8Grantlee4Node16staticMetaObjectE@Base 5.0.0 + _ZN8Grantlee4NodeC1EP7QObject@Base 5.0.0 + _ZN8Grantlee4NodeC2EP7QObject@Base 5.0.0 + _ZN8Grantlee4NodeD0Ev@Base 5.0.0 + _ZN8Grantlee4NodeD1Ev@Base 5.0.0 + _ZN8Grantlee4NodeD2Ev@Base 5.0.0 + _ZN8Grantlee6Engine11loadLibraryERK7QString@Base 5.0.0 + _ZN8Grantlee6Engine11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.0 + _ZN8Grantlee6Engine11qt_metacastEPKc@Base 5.0.0 + _ZN8Grantlee6Engine13addPluginPathERK7QString@Base 5.0.0 + _ZN8Grantlee6Engine14setPluginPathsERK11QStringList@Base 5.0.0 + _ZN8Grantlee6Engine15templateLoadersEv@Base 5.0.0 + _ZN8Grantlee6Engine16removePluginPathERK7QString@Base 5.0.0 + _ZN8Grantlee6Engine16staticMetaObjectE@Base 5.0.0 + _ZN8Grantlee6Engine17addDefaultLibraryERK7QString@Base 5.0.0 + _ZN8Grantlee6Engine17addTemplateLoaderE14QSharedPointerINS_22AbstractTemplateLoaderEE@Base 5.0.0 + _ZN8Grantlee6Engine19setSmartTrimEnabledEb@Base 5.0.0 + _ZN8Grantlee6Engine20loadDefaultLibrariesEv@Base 5.0.0 + _ZN8Grantlee6Engine20removeDefaultLibraryERK7QString@Base 5.0.0 + _ZN8Grantlee6EngineC1EP7QObject@Base 5.0.0 + _ZN8Grantlee6EngineC2EP7QObject@Base 5.0.0 + _ZN8Grantlee6EngineD0Ev@Base 5.0.0 + _ZN8Grantlee6EngineD1Ev@Base 5.0.0 + _ZN8Grantlee6EngineD2Ev@Base 5.0.0 + _ZN8Grantlee6Filter9setStreamEPNS_12OutputStreamE@Base 5.0.0 + _ZN8Grantlee6FilterD0Ev@Base 5.0.0 + _ZN8Grantlee6FilterD1Ev@Base 5.0.0 + _ZN8Grantlee6FilterD2Ev@Base 5.0.0 + _ZN8Grantlee6Parser11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.0 + _ZN8Grantlee6Parser11qt_metacastEPKc@Base 5.0.0 + _ZN8Grantlee6Parser12prependTokenERKNS_5TokenE@Base 5.0.0 + _ZN8Grantlee6Parser13takeNextTokenEv@Base 5.0.0 + _ZN8Grantlee6Parser15invalidBlockTagERKNS_5TokenERK7QStringRK11QStringList@Base 5.1.0 + _ZN8Grantlee6Parser15removeNextTokenEv@Base 5.0.0 + _ZN8Grantlee6Parser16staticMetaObjectE@Base 5.0.0 + _ZN8Grantlee6Parser5parseEPNS_12TemplateImplERK11QStringList@Base 5.0.0 + _ZN8Grantlee6Parser5parseEPNS_4NodeERK11QStringList@Base 5.0.0 + _ZN8Grantlee6Parser5parseEPNS_4NodeERK7QString@Base 5.0.0 + _ZN8Grantlee6Parser7loadLibERK7QString@Base 5.0.0 + _ZN8Grantlee6Parser8skipPastERK7QString@Base 5.0.0 + _ZN8Grantlee6ParserC1ERK5QListINS_5TokenEEP7QObject@Base 5.0.0 + _ZN8Grantlee6ParserC2ERK5QListINS_5TokenEEP7QObject@Base 5.0.0 + _ZN8Grantlee6ParserD0Ev@Base 5.0.0 + _ZN8Grantlee6ParserD1Ev@Base 5.0.0 + _ZN8Grantlee6ParserD2Ev@Base 5.0.0 + _ZN8Grantlee6equalsERK8QVariantS2_@Base 5.0.0 + _ZN8Grantlee7Context10setUrlTypeENS0_7UrlTypeE@Base 5.0.0 + _ZN8Grantlee7Context11setMutatingEb@Base 5.0.0 + _ZN8Grantlee7Context12setLocalizerE14QSharedPointerINS_17AbstractLocalizerEE@Base 5.0.0 + _ZN8Grantlee7Context13setAutoEscapeEb@Base 5.0.0 + _ZN8Grantlee7Context16addExternalMediaERK7QStringS3_@Base 5.0.0 + _ZN8Grantlee7Context18clearExternalMediaEv@Base 5.0.0 + _ZN8Grantlee7Context20setRelativeMediaPathERK7QString@Base 5.0.0 + _ZN8Grantlee7Context3popEv@Base 5.0.0 + _ZN8Grantlee7Context4pushEv@Base 5.0.0 + _ZN8Grantlee7Context6insertERK7QStringP7QObject@Base 5.0.0 + _ZN8Grantlee7Context6insertERK7QStringRK8QVariant@Base 5.0.0 + _ZN8Grantlee7ContextC1ERK5QHashI7QString8QVariantE@Base 5.0.0 + _ZN8Grantlee7ContextC1ERKS0_@Base 5.0.0 + _ZN8Grantlee7ContextC1Ev@Base 5.0.0 + _ZN8Grantlee7ContextC2ERK5QHashI7QString8QVariantE@Base 5.0.0 + _ZN8Grantlee7ContextC2ERKS0_@Base 5.0.0 + _ZN8Grantlee7ContextC2Ev@Base 5.0.0 + _ZN8Grantlee7ContextD1Ev@Base 5.0.0 + _ZN8Grantlee7ContextD2Ev@Base 5.0.0 + _ZN8Grantlee7ContextaSERKS0_@Base 5.0.0 + _ZN8Grantlee8MetaType12internalLockEv@Base 5.0.0 + _ZN8Grantlee8MetaType14internalUnlockEv@Base 5.0.0 + _ZN8Grantlee8MetaType22registerLookUpOperatorEiPF8QVariantRKS1_RK7QStringE@Base 5.0.0 + _ZN8Grantlee8MetaType23lookupAlreadyRegisteredEi@Base 5.0.0 + _ZN8Grantlee8MetaType6lookupERK8QVariantRK7QString@Base 5.0.0 + _ZN8Grantlee8NodeList6appendE5QListIPNS_4NodeEE@Base 5.0.0 + _ZN8Grantlee8NodeList6appendEPNS_4NodeE@Base 5.0.0 + _ZN8Grantlee8NodeListC1ERK5QListIPNS_4NodeEE@Base 5.0.0 + _ZN8Grantlee8NodeListC1ERKS0_@Base 5.0.0 + _ZN8Grantlee8NodeListC1Ev@Base 5.0.0 + _ZN8Grantlee8NodeListC2ERK5QListIPNS_4NodeEE@Base 5.0.0 + _ZN8Grantlee8NodeListC2ERKS0_@Base 5.0.0 + _ZN8Grantlee8NodeListC2Ev@Base 5.0.0 + _ZN8Grantlee8NodeListD1Ev@Base 5.0.0 + _ZN8Grantlee8NodeListD2Ev@Base 5.0.0 + _ZN8Grantlee8NodeListaSERKS0_@Base 5.1.0 + _ZN8Grantlee8TextNode11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.0 + _ZN8Grantlee8TextNode11qt_metacastEPKc@Base 5.0.0 + _ZN8Grantlee8TextNode16staticMetaObjectE@Base 5.0.0 + _ZN8Grantlee8TextNodeC1ERK7QStringP7QObject@Base 5.0.0 + _ZN8Grantlee8TextNodeC2ERK7QStringP7QObject@Base 5.0.0 + _ZN8Grantlee8VariableC1ERK7QString@Base 5.0.0 + _ZN8Grantlee8VariableC1ERKS0_@Base 5.0.0 + _ZN8Grantlee8VariableC1Ev@Base 5.0.0 + _ZN8Grantlee8VariableC2ERK7QString@Base 5.0.0 + _ZN8Grantlee8VariableC2ERKS0_@Base 5.0.0 + _ZN8Grantlee8VariableC2Ev@Base 5.0.0 + _ZN8Grantlee8VariableD1Ev@Base 5.0.0 + _ZN8Grantlee8VariableD2Ev@Base 5.0.0 + _ZN8Grantlee8VariableaSERKS0_@Base 5.0.0 + _ZN8Grantlee8markSafeERKNS_10SafeStringE@Base 5.0.0 + _ZN8Grantlee8toStringERK5QListI8QVariantE@Base 5.0.0 + _ZNK8Grantlee10SafeString11needsEscapeEv@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString10normalizedEN7QString17NormalizationFormE@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString10normalizedEN7QString17NormalizationFormEN5QChar14UnicodeVersionE@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString10simplifiedEv@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString13leftJustifiedEi5QCharb@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString14rightJustifiedEi5QCharb@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString3midEii@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString4leftEi@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString5rightEi@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString5splitERK18QRegularExpressionN7QString13SplitBehaviorE@Base 5.1.0 + _ZNK8Grantlee10SafeString12NestedString5splitERK5QCharN7QString13SplitBehaviorEN2Qt15CaseSensitivityE@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString5splitERK7QStringNS2_13SplitBehaviorEN2Qt15CaseSensitivityE@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString5splitERKS0_N7QString13SplitBehaviorEN2Qt15CaseSensitivityE@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString7sectionE5QCharii6QFlagsIN7QString11SectionFlagEE@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString7sectionERK18QRegularExpressionii6QFlagsIN7QString11SectionFlagEE@Base 5.1.0 + _ZNK8Grantlee10SafeString12NestedString7sectionERK7QStringii6QFlagsINS2_11SectionFlagEE@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString7sectionERKS0_ii6QFlagsIN7QString11SectionFlagEE@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString7toLowerEv@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString7toUpperEv@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString7trimmedEv@Base 5.0.0 + _ZNK8Grantlee10SafeString12NestedString8repeatedEi@Base 5.0.0 + _ZNK8Grantlee10SafeString6isSafeEv@Base 5.0.0 + _ZNK8Grantlee10SafeStringeqERK7QString@Base 5.0.0 + _ZNK8Grantlee10SafeStringeqERKS0_@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer12localizeDateERK5QDateN7QLocale10FormatTypeE@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer12localizeTimeERK5QTimeN7QLocale10FormatTypeE@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer13currentLocaleEv@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer14localizeNumberEd@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer14localizeNumberEi@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer14localizeStringERK7QStringRK5QListI8QVariantE@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer16localizeDateTimeERK9QDateTimeN7QLocale10FormatTypeE@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer20localizePluralStringERK7QStringS3_RK5QListI8QVariantE@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer21localizeContextStringERK7QStringS3_RK5QListI8QVariantE@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer21localizeMonetaryValueEdRK7QString@Base 5.0.0 + _ZNK8Grantlee11QtLocalizer27localizePluralContextStringERK7QStringS3_S3_RK5QListI8QVariantE@Base 5.0.0 + _ZNK8Grantlee12OutputStream17conditionalEscapeERKNS_10SafeStringE@Base 5.0.0 + _ZNK8Grantlee12OutputStream5cloneEP11QTextStream@Base 5.0.0 + _ZNK8Grantlee12OutputStream6escapeERK7QString@Base 5.0.0 + _ZNK8Grantlee12OutputStream6escapeERKNS_10SafeStringE@Base 5.0.0 + _ZNK8Grantlee12TemplateImpl10metaObjectEv@Base 5.0.0 + _ZNK8Grantlee12TemplateImpl11errorStringEv@Base 5.0.0 + _ZNK8Grantlee12TemplateImpl5errorEv@Base 5.0.0 + _ZNK8Grantlee12TemplateImpl6engineEv@Base 5.0.0 + _ZNK8Grantlee12TemplateImpl6renderEPNS_12OutputStreamEPNS_7ContextE@Base 5.0.0 + _ZNK8Grantlee12TemplateImpl6renderEPNS_7ContextE@Base 5.0.0 + _ZNK8Grantlee12TemplateImpl8nodeListEv@Base 5.0.0 + _ZNK8Grantlee12VariableNode10metaObjectEv@Base 5.0.0 + _ZNK8Grantlee12VariableNode6renderEPNS_12OutputStreamEPNS_7ContextE@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer12localizeDateERK5QDateN7QLocale10FormatTypeE@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer12localizeTimeERK5QTimeN7QLocale10FormatTypeE@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer13currentLocaleEv@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer14localizeNumberEd@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer14localizeNumberEi@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer14localizeStringERK7QStringRK5QListI8QVariantE@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer16localizeDateTimeERK9QDateTimeN7QLocale10FormatTypeE@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer20localizePluralStringERK7QStringS3_RK5QListI8QVariantE@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer21localizeContextStringERK7QStringS3_RK5QListI8QVariantE@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer21localizeMonetaryValueEdRK7QString@Base 5.0.0 + _ZNK8Grantlee13NullLocalizer27localizePluralContextStringERK7QStringS3_S3_RK5QListI8QVariantE@Base 5.0.0 + _ZNK8Grantlee13RenderContext8containsEPNS_4NodeE@Base 5.0.0 + _ZNK8Grantlee16FilterExpression6isTrueEPNS_7ContextE@Base 5.0.0 + _ZNK8Grantlee16FilterExpression6toListEPNS_7ContextE@Base 5.0.0 + _ZNK8Grantlee16FilterExpression7filtersEv@Base 5.0.0 + _ZNK8Grantlee16FilterExpression7isValidEv@Base 5.0.0 + _ZNK8Grantlee16FilterExpression7resolveEPNS_12OutputStreamEPNS_7ContextE@Base 5.0.0 + _ZNK8Grantlee16FilterExpression7resolveEPNS_7ContextE@Base 5.0.0 + _ZNK8Grantlee16FilterExpression8variableEv@Base 5.0.0 + _ZNK8Grantlee17AbstractLocalizer8localizeERK8QVariant@Base 5.0.0 + _ZNK8Grantlee19AbstractNodeFactory10metaObjectEv@Base 5.0.0 + _ZNK8Grantlee19AbstractNodeFactory10smartSplitERK7QString@Base 5.0.0 + _ZNK8Grantlee19AbstractNodeFactory23getFilterExpressionListERK11QStringListPNS_6ParserE@Base 5.0.0 + _ZNK8Grantlee22CachingLoaderDecorator10loadByNameERK7QStringPKNS_6EngineE@Base 5.0.0 + _ZNK8Grantlee22CachingLoaderDecorator11getMediaUriERK7QString@Base 5.0.0 + _ZNK8Grantlee22CachingLoaderDecorator15canLoadTemplateERK7QString@Base 5.0.0 + _ZNK8Grantlee22CachingLoaderDecorator4sizeEv@Base 5.0.0 + _ZNK8Grantlee22CachingLoaderDecorator7isEmptyEv@Base 5.0.0 + _ZNK8Grantlee22InMemoryTemplateLoader10loadByNameERK7QStringPKNS_6EngineE@Base 5.0.0 + _ZNK8Grantlee22InMemoryTemplateLoader11getMediaUriERK7QString@Base 5.0.0 + _ZNK8Grantlee22InMemoryTemplateLoader15canLoadTemplateERK7QString@Base 5.0.0 + _ZNK8Grantlee24FileSystemTemplateLoader10loadByNameERK7QStringPKNS_6EngineE@Base 5.0.0 + _ZNK8Grantlee24FileSystemTemplateLoader11getMediaUriERK7QString@Base 5.0.0 + _ZNK8Grantlee24FileSystemTemplateLoader12templateDirsEv@Base 5.0.0 + _ZNK8Grantlee24FileSystemTemplateLoader15canLoadTemplateERK7QString@Base 5.0.0 + _ZNK8Grantlee24FileSystemTemplateLoader9themeNameEv@Base 5.0.0 + _ZNK8Grantlee4Node10metaObjectEv@Base 5.0.0 + _ZNK8Grantlee4Node17containerTemplateEv@Base 5.0.0 + _ZNK8Grantlee4Node20streamValueInContextEPNS_12OutputStreamERK8QVariantPNS_7ContextE@Base 5.0.0 + _ZNK8Grantlee6Engine10loadByNameERK7QString@Base 5.0.0 + _ZNK8Grantlee6Engine10metaObjectEv@Base 5.0.0 + _ZNK8Grantlee6Engine11newTemplateERK7QStringS3_@Base 5.0.0 + _ZNK8Grantlee6Engine11pluginPathsEv@Base 5.0.0 + _ZNK8Grantlee6Engine16defaultLibrariesEv@Base 5.0.0 + _ZNK8Grantlee6Engine16smartTrimEnabledEv@Base 5.0.0 + _ZNK8Grantlee6Engine8mediaUriERK7QString@Base 5.0.0 + _ZNK8Grantlee6Filter17conditionalEscapeERKNS_10SafeStringE@Base 5.0.0 + _ZNK8Grantlee6Filter6escapeERK7QString@Base 5.0.0 + _ZNK8Grantlee6Filter6escapeERKNS_10SafeStringE@Base 5.0.0 + _ZNK8Grantlee6Filter6isSafeEv@Base 5.0.0 + _ZNK8Grantlee6Parser10metaObjectEv@Base 5.0.0 + _ZNK8Grantlee6Parser12hasNextTokenEv@Base 5.0.0 + _ZNK8Grantlee6Parser9getFilterERK7QString@Base 5.0.0 + _ZNK8Grantlee7Context10autoEscapeEv@Base 5.0.0 + _ZNK8Grantlee7Context10isMutatingEv@Base 5.0.0 + _ZNK8Grantlee7Context13externalMediaEv@Base 5.0.0 + _ZNK8Grantlee7Context13renderContextEv@Base 5.0.0 + _ZNK8Grantlee7Context17relativeMediaPathEv@Base 5.0.0 + _ZNK8Grantlee7Context6lookupERK7QString@Base 5.0.0 + _ZNK8Grantlee7Context7urlTypeEv@Base 5.0.0 + _ZNK8Grantlee7Context9localizerEv@Base 5.0.0 + _ZNK8Grantlee7Context9stackHashEi@Base 5.0.0 + _ZNK8Grantlee8NodeList15containsNonTextEv@Base 5.0.0 + _ZNK8Grantlee8NodeList6renderEPNS_12OutputStreamEPNS_7ContextE@Base 5.0.0 + _ZNK8Grantlee8TextNode10metaObjectEv@Base 5.0.0 + _ZNK8Grantlee8Variable10isConstantEv@Base 5.0.0 + _ZNK8Grantlee8Variable11isLocalizedEv@Base 5.0.0 + _ZNK8Grantlee8Variable6isTrueEPNS_7ContextE@Base 5.0.0 + _ZNK8Grantlee8Variable7isValidEv@Base 5.0.0 + _ZNK8Grantlee8Variable7literalEv@Base 5.0.0 + _ZNK8Grantlee8Variable7lookupsEv@Base 5.0.0 + _ZNK8Grantlee8Variable7resolveEPNS_7ContextE@Base 5.0.0 + _ZTIN8Grantlee11QtLocalizerE@Base 5.0.0 + _ZTIN8Grantlee12OutputStreamE@Base 5.0.0 + _ZTIN8Grantlee12TemplateImplE@Base 5.0.0 + _ZTIN8Grantlee12VariableNodeE@Base 5.0.0 + _ZTIN8Grantlee13NullLocalizerE@Base 5.0.0 + _ZTIN8Grantlee17AbstractLocalizerE@Base 5.0.0 + _ZTIN8Grantlee19AbstractNodeFactoryE@Base 5.0.0 + _ZTIN8Grantlee22AbstractTemplateLoaderE@Base 5.0.0 + _ZTIN8Grantlee22CachingLoaderDecoratorE@Base 5.0.0 + _ZTIN8Grantlee22InMemoryTemplateLoaderE@Base 5.0.0 + _ZTIN8Grantlee24FileSystemTemplateLoaderE@Base 5.0.0 + _ZTIN8Grantlee4NodeE@Base 5.0.0 + _ZTIN8Grantlee6EngineE@Base 5.0.0 + _ZTIN8Grantlee6FilterE@Base 5.0.0 + _ZTIN8Grantlee6ParserE@Base 5.0.0 + _ZTIN8Grantlee8TextNodeE@Base 5.0.0 + _ZTIN8Grantlee9ExceptionE@Base 5.0.0 + _ZTSN8Grantlee11QtLocalizerE@Base 5.0.0 + _ZTSN8Grantlee12OutputStreamE@Base 5.0.0 + _ZTSN8Grantlee12TemplateImplE@Base 5.0.0 + _ZTSN8Grantlee12VariableNodeE@Base 5.0.0 + _ZTSN8Grantlee13NullLocalizerE@Base 5.0.0 + _ZTSN8Grantlee17AbstractLocalizerE@Base 5.0.0 + _ZTSN8Grantlee19AbstractNodeFactoryE@Base 5.0.0 + _ZTSN8Grantlee22AbstractTemplateLoaderE@Base 5.0.0 + _ZTSN8Grantlee22CachingLoaderDecoratorE@Base 5.0.0 + _ZTSN8Grantlee22InMemoryTemplateLoaderE@Base 5.0.0 + _ZTSN8Grantlee24FileSystemTemplateLoaderE@Base 5.0.0 + _ZTSN8Grantlee4NodeE@Base 5.0.0 + _ZTSN8Grantlee6EngineE@Base 5.0.0 + _ZTSN8Grantlee6FilterE@Base 5.0.0 + _ZTSN8Grantlee6ParserE@Base 5.0.0 + _ZTSN8Grantlee8TextNodeE@Base 5.0.0 + _ZTSN8Grantlee9ExceptionE@Base 5.0.0 + _ZTVN8Grantlee11QtLocalizerE@Base 5.0.0 + _ZTVN8Grantlee12OutputStreamE@Base 5.0.0 + _ZTVN8Grantlee12TemplateImplE@Base 5.0.0 + _ZTVN8Grantlee12VariableNodeE@Base 5.0.0 + _ZTVN8Grantlee13NullLocalizerE@Base 5.0.0 + _ZTVN8Grantlee17AbstractLocalizerE@Base 5.0.0 + _ZTVN8Grantlee19AbstractNodeFactoryE@Base 5.0.0 + _ZTVN8Grantlee22AbstractTemplateLoaderE@Base 5.0.0 + _ZTVN8Grantlee22CachingLoaderDecoratorE@Base 5.0.0 + _ZTVN8Grantlee22InMemoryTemplateLoaderE@Base 5.0.0 + _ZTVN8Grantlee24FileSystemTemplateLoaderE@Base 5.0.0 + _ZTVN8Grantlee4NodeE@Base 5.0.0 + _ZTVN8Grantlee6EngineE@Base 5.0.0 + _ZTVN8Grantlee6FilterE@Base 5.0.0 + _ZTVN8Grantlee6ParserE@Base 5.0.0 + _ZTVN8Grantlee8TextNodeE@Base 5.0.0 + _ZTVN8Grantlee9ExceptionE@Base 5.0.0 + qt_plugin_instance@Base 5.0.0 + qt_plugin_query_metadata@Base 5.0.0 diff -Nru grantlee5-5.0.0/debian/libgrantlee-textdocument5.install grantlee5-5.1.0/debian/libgrantlee-textdocument5.install --- grantlee5-5.0.0/debian/libgrantlee-textdocument5.install 2014-12-08 20:30:53.000000000 +0000 +++ grantlee5-5.1.0/debian/libgrantlee-textdocument5.install 2016-10-24 09:35:52.000000000 +0000 @@ -1,3 +1,2 @@ - -usr/lib/libGrantlee_TextDocument.so.5 -usr/lib/libGrantlee_TextDocument.so.5.0.0 +usr/lib/*/libGrantlee_TextDocument.so.5 +usr/lib/*/libGrantlee_TextDocument.so.5.* diff -Nru grantlee5-5.0.0/debian/libgrantlee-textdocument5.symbols grantlee5-5.1.0/debian/libgrantlee-textdocument5.symbols --- grantlee5-5.0.0/debian/libgrantlee-textdocument5.symbols 1970-01-01 00:00:00.000000000 +0000 +++ grantlee5-5.1.0/debian/libgrantlee-textdocument5.symbols 2016-10-24 09:35:52.000000000 +0000 @@ -0,0 +1,229 @@ +# SymbolsHelper-Confirmed: 5.1.0 amd64 +libGrantlee_TextDocument.so.5 libgrantlee-textdocument5 #MINVER# + _ZN8Grantlee14MarkupDirector11processListEN10QTextFrame8iteratorERK10QTextBlockP9QTextList@Base 5.0.0 + _ZN8Grantlee14MarkupDirector12processBlockEN10QTextFrame8iteratorERK10QTextBlock@Base 5.0.0 + _ZN8Grantlee14MarkupDirector12processFrameEN10QTextFrame8iteratorEPS1_@Base 5.0.0 + _ZN8Grantlee14MarkupDirector12processImageEN10QTextBlock8iteratorERK16QTextImageFormatP13QTextDocument@Base 5.0.0 + _ZN8Grantlee14MarkupDirector12processTableEN10QTextFrame8iteratorEP10QTextTable@Base 5.0.0 + _ZN8Grantlee14MarkupDirector13processObjectEN10QTextFrame8iteratorERK10QTextBlockP11QTextObject@Base 5.0.0 + _ZN8Grantlee14MarkupDirector14skipBlockGroupEN10QTextFrame8iteratorERK10QTextBlockP15QTextBlockGroup@Base 5.0.0 + _ZN8Grantlee14MarkupDirector15processDocumentEP13QTextDocument@Base 5.0.0 + _ZN8Grantlee14MarkupDirector15processFragmentEN10QTextBlock8iteratorERK13QTextFragmentPK13QTextDocument@Base 5.0.0 + _ZN8Grantlee14MarkupDirector16processTableCellERK14QTextTableCellP10QTextTable@Base 5.0.0 + _ZN8Grantlee14MarkupDirector17getElementsToOpenEN10QTextBlock8iteratorE@Base 5.0.0 + _ZN8Grantlee14MarkupDirector17processBlockGroupEN10QTextFrame8iteratorERK10QTextBlockP15QTextBlockGroup@Base 5.0.0 + _ZN8Grantlee14MarkupDirector20processBlockContentsEN10QTextFrame8iteratorERK10QTextBlock@Base 5.0.0 + _ZN8Grantlee14MarkupDirector21processCharTextObjectEN10QTextBlock8iteratorERK13QTextFragmentP11QTextObject@Base 5.0.0 + _ZN8Grantlee14MarkupDirector21processCustomFragmentERK13QTextFragmentPK13QTextDocument@Base 5.0.0 + _ZN8Grantlee14MarkupDirector22processClosingElementsEN10QTextBlock8iteratorE@Base 5.0.0 + _ZN8Grantlee14MarkupDirector22processOpeningElementsEN10QTextBlock8iteratorE@Base 5.0.0 + _ZN8Grantlee14MarkupDirector23processDocumentContentsEN10QTextFrame8iteratorES2_@Base 5.0.0 + _ZN8Grantlee14MarkupDirectorC1EPNS_21AbstractMarkupBuilderE@Base 5.0.0 + _ZN8Grantlee14MarkupDirectorC2EPNS_21AbstractMarkupBuilderE@Base 5.0.0 + _ZN8Grantlee14MarkupDirectorD0Ev@Base 5.0.0 + _ZN8Grantlee14MarkupDirectorD1Ev@Base 5.0.0 + _ZN8Grantlee14MarkupDirectorD2Ev@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder10addNewlineEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder10beginTableEddRK7QString@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder11beginAnchorERK7QStringS3_@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder11beginHeaderEi@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder11beginStrongEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder11endListItemEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder11endTableRowEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder11insertImageERK7QStringdd@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder12endParagraphEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder12endStrikeoutEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder12endSubscriptEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder12endTableCellEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder12endUnderlineEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder13appendRawTextERK7QString@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder13beginListItemEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder13beginTableRowEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder13endBackgroundEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder13endFontFamilyEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder13endForegroundEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder14beginParagraphE6QFlagsIN2Qt13AlignmentFlagEEdddd@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder14beginStrikeoutEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder14beginSubscriptEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder14beginTableCellERK7QStringii@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder14beginUnderlineEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder14endSuperscriptEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder15beginBackgroundERK6QBrush@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder15beginFontFamilyERK7QString@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder15beginForegroundERK6QBrush@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder16beginSuperscriptEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder16endFontPointSizeEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder17appendLiteralTextERK7QString@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder18beginFontPointSizeEi@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder18endTableHeaderCellEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder20beginTableHeaderCellERK7QStringii@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder20insertHorizontalRuleEi@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder7endEmphEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder7endListEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder8endTableEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder9beginEmphEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder9beginListEN15QTextListFormat5StyleE@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder9endAnchorEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder9endHeaderEi@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder9endStrongEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilder9getResultEv@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilderC1Ev@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilderC2Ev@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilderD0Ev@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilderD1Ev@Base 5.0.0 + _ZN8Grantlee15TextHTMLBuilderD2Ev@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder10addNewlineEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder10beginTableEddRK7QString@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder11beginAnchorERK7QStringS3_@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder11beginHeaderEi@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder11beginStrongEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder11endListItemEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder11endTableRowEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder11insertImageERK7QStringdd@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder12addReferenceERK7QString@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder12endParagraphEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder12endStrikeoutEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder12endSubscriptEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder12endTableCellEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder12endUnderlineEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder13appendRawTextERK7QString@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder13beginListItemEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder13beginTableRowEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder13endBackgroundEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder13endFontFamilyEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder13endForegroundEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder14beginParagraphE6QFlagsIN2Qt13AlignmentFlagEEdddd@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder14beginStrikeoutEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder14beginSubscriptEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder14beginTableCellERK7QStringii@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder14beginUnderlineEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder14endSuperscriptEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder15beginBackgroundERK6QBrush@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder15beginFontFamilyERK7QString@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder15beginForegroundERK6QBrush@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder16beginSuperscriptEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder16endFontPointSizeEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder17appendLiteralTextERK7QString@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder18beginFontPointSizeEi@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder18endTableHeaderCellEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder20beginTableHeaderCellERK7QStringii@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder20insertHorizontalRuleEi@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder7endEmphEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder7endListEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder8endTableEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder9beginEmphEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder9beginListEN15QTextListFormat5StyleE@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder9endAnchorEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder9endHeaderEi@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder9endStrongEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilder9getResultEv@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilderC1Ev@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilderC2Ev@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilderD0Ev@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilderD1Ev@Base 5.0.0 + _ZN8Grantlee22PlainTextMarkupBuilderD2Ev@Base 5.0.0 + _ZNK8Grantlee14MarkupDirector16sortOpeningOrderE4QSetIiEN10QTextBlock8iteratorE@Base 5.0.0 + _ZNK8Grantlee14MarkupDirector18getElementsToCloseEN10QTextBlock8iteratorE@Base 5.0.0 + _ZTIN8Grantlee14MarkupDirectorE@Base 5.0.0 + _ZTIN8Grantlee15TextHTMLBuilderE@Base 5.0.0 + _ZTIN8Grantlee21AbstractMarkupBuilderE@Base 5.0.0 + _ZTIN8Grantlee22PlainTextMarkupBuilderE@Base 5.0.0 + _ZTSN8Grantlee14MarkupDirectorE@Base 5.0.0 + _ZTSN8Grantlee15TextHTMLBuilderE@Base 5.0.0 + _ZTSN8Grantlee21AbstractMarkupBuilderE@Base 5.0.0 + _ZTSN8Grantlee22PlainTextMarkupBuilderE@Base 5.0.0 + _ZTTN8Grantlee15TextHTMLBuilderE@Base 5.0.0 + _ZTTN8Grantlee22PlainTextMarkupBuilderE@Base 5.0.0 + _ZTVN8Grantlee14MarkupDirectorE@Base 5.0.0 + _ZTVN8Grantlee15TextHTMLBuilderE@Base 5.0.0 + _ZTVN8Grantlee22PlainTextMarkupBuilderE@Base 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::addNewline()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::appendLiteralText(QString const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::appendRawText(QString const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginAnchor(QString const&, QString const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginBackground(QBrush const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginEmph()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginFontFamily(QString const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginFontPointSize(int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginForeground(QBrush const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginHeader(int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginList(QTextListFormat::Style)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginListItem()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginParagraph(QFlags, double, double, double, double)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginStrikeout()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginStrong()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginSubscript()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginSuperscript()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginTable(double, double, QString const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginTableCell(QString const&, int, int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginTableHeaderCell(QString const&, int, int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginTableRow()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::beginUnderline()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endAnchor()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endBackground()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endEmph()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endFontFamily()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endFontPointSize()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endForeground()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endHeader(int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endList()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endListItem()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endParagraph()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endStrikeout()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endStrong()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endSubscript()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endSuperscript()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endTable()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endTableCell()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endTableHeaderCell()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endTableRow()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::endUnderline()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::getResult()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::insertHorizontalRule(int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::insertImage(QString const&, double, double)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::PlainTextMarkupBuilder::~PlainTextMarkupBuilder()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::addNewline()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::appendLiteralText(QString const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::appendRawText(QString const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginAnchor(QString const&, QString const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginBackground(QBrush const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginEmph()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginFontFamily(QString const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginFontPointSize(int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginForeground(QBrush const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginHeader(int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginList(QTextListFormat::Style)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginListItem()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginParagraph(QFlags, double, double, double, double)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginStrikeout()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginStrong()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginSubscript()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginSuperscript()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginTable(double, double, QString const&)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginTableCell(QString const&, int, int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginTableHeaderCell(QString const&, int, int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginTableRow()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::beginUnderline()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endAnchor()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endBackground()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endEmph()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endFontFamily()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endFontPointSize()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endForeground()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endHeader(int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endList()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endListItem()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endParagraph()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endStrikeout()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endStrong()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endSubscript()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endSuperscript()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endTable()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endTableCell()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endTableHeaderCell()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endTableRow()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::endUnderline()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::getResult()@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::insertHorizontalRule(int)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::insertImage(QString const&, double, double)@Base" 5.0.0 + (c++)"virtual thunk to Grantlee::TextHTMLBuilder::~TextHTMLBuilder()@Base" 5.0.0 diff -Nru grantlee5-5.0.0/debian/patches/series grantlee5-5.1.0/debian/patches/series --- grantlee5-5.0.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ grantlee5-5.1.0/debian/patches/series 2016-10-24 09:35:52.000000000 +0000 @@ -0,0 +1 @@ +variantIsTrue-float-fix.diff diff -Nru grantlee5-5.0.0/debian/patches/variantIsTrue-float-fix.diff grantlee5-5.1.0/debian/patches/variantIsTrue-float-fix.diff --- grantlee5-5.0.0/debian/patches/variantIsTrue-float-fix.diff 1970-01-01 00:00:00.000000000 +0000 +++ grantlee5-5.1.0/debian/patches/variantIsTrue-float-fix.diff 2016-10-24 09:35:52.000000000 +0000 @@ -0,0 +1,39 @@ +Author: Pino Toscano +Description: Fix variantIsTrue for float variants + The test data for TestDefaultTags::testIfTag() has been expaded to + include if-truthiness data explicitly for double and float values, + so the they can be both tested no matter what qreal is. +Last-Update: 2013-12-08 +Forwarded: https://www.gitorious.org/grantlee/grantlee/merge_requests/10 + +--- a/templates/tests/testdefaulttags.cpp ++++ b/templates/tests/testdefaulttags.cpp +@@ -1064,6 +1064,28 @@ + << QStringLiteral("{% if var %}Yes{% else %}No{% endif %}") << dict + << QStringLiteral("Yes") << NoError; + ++ double d = 0.0; ++ dict.insert(QStringLiteral( "var" ), d); ++ QTest::newRow("if-truthiness11") ++ << QStringLiteral("{% if var %}Yes{% else %}No{% endif %}") ++ << dict << QStringLiteral("No") << NoError; ++ d = 7.1; ++ dict.insert(QStringLiteral("var"), d); ++ QTest::newRow("if-truthiness12") ++ << QStringLiteral("{% if var %}Yes{% else %}No{% endif %}") ++ << dict << QStringLiteral("Yes") << NoError; ++ ++ float f = 0.0; ++ dict.insert(QStringLiteral("var"), f); ++ QTest::newRow("if-truthiness13") ++ << QStringLiteral("{% if var %}Yes{% else %}No{% endif %}") ++ << dict << QStringLiteral("No") << NoError; ++ f = 7.1; ++ dict.insert(QStringLiteral("var"), f); ++ QTest::newRow("if-truthiness14") ++ << QStringLiteral("{% if var %}Yes{% else %}No{% endif %}") ++ << dict << QStringLiteral("Yes") << NoError; ++ + dict.clear(); + QTest::newRow("if-tag-badarg01") + << QStringLiteral("{% if x|default_if_none:y %}yes{% endif %}") << dict diff -Nru grantlee5-5.0.0/debian/rules grantlee5-5.1.0/debian/rules --- grantlee5-5.0.0/debian/rules 2014-12-08 12:55:24.000000000 +0000 +++ grantlee5-5.1.0/debian/rules 2016-10-24 09:35:52.000000000 +0000 @@ -1,6 +1,7 @@ #!/usr/bin/make -f DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) testsuite_failing_archs := ia64 sparc64 ifneq (,$(filter $(DEB_HOST_ARCH),$(testsuite_failing_archs))) @@ -11,16 +12,18 @@ dh $@ --parallel --with pkgkde_symbolshelper override_dh_auto_configure: - dh_auto_configure -- -DBUILD_TESTS=ON + dh_auto_configure -- -DBUILD_TESTS=ON -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" +ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),) override_dh_auto_test: xvfb-run dh_auto_test $(fail_param) +endif override_dh_makeshlibs: - dh_makeshlibs -V -X/usr/lib/grantlee/ + dh_makeshlibs -V -X/usr/lib/$(DEB_HOST_MULTIARCH)/grantlee/ override_dh_install: dh_install --fail-missing override_dh_strip: - dh_strip --dbg-package=grantlee5-dbg + dh_strip --dbgsym-migration='grantlee5-dbg (<= 5.1.0-1~~)' diff -Nru grantlee5-5.0.0/dox/for_app_dev.dox grantlee5-5.1.0/dox/for_app_dev.dox --- grantlee5-5.0.0/dox/for_app_dev.dox 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/dox/for_app_dev.dox 2016-04-19 06:33:17.000000000 +0000 @@ -194,7 +194,7 @@ public: PersonWrapper(const QString &name, int age, Home *home); - QObject* home() const { return home(); } + QObject* scriptableHome() const { return home(); } Home* home() const; // ... diff -Nru grantlee5-5.0.0/dox/using_and_deploying.dox grantlee5-5.1.0/dox/using_and_deploying.dox --- grantlee5-5.0.0/dox/using_and_deploying.dox 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/dox/using_and_deploying.dox 2016-04-19 06:33:17.000000000 +0000 @@ -176,7 +176,7 @@ @code # CMake code: set (_rcc_file "my_qtscript_library.qrc") - qt5_add_resources(_scripted_rcc_src ${_rcc_file} OPTIONS -root "/plugins/grantlee/${Grantlee_VERSION_MAJOR}.${Grantlee_VERSION_MINOR}" ) + qt5_add_resources(_scripted_rcc_src ${_rcc_file} OPTIONS -root "/plugins/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" ) add_executable(my_app, ${my_app_srcs} ${_scripted_rcc_src}) diff -Nru grantlee5-5.0.0/examples/books/bookdelegate.cpp grantlee5-5.1.0/examples/books/bookdelegate.cpp --- grantlee5-5.0.0/examples/books/bookdelegate.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/books/bookdelegate.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -41,8 +41,8 @@ #include "bookdelegate.h" -#include #include +#include #include BookDelegate::BookDelegate(QObject *parent) @@ -51,77 +51,87 @@ } void BookDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const + const QModelIndex &index) const { - if (index.column() != 5) { - QStyleOptionViewItemV3 opt = option; - opt.rect.adjust(0, 0, -1, -1); // since we draw the grid ourselves - QSqlRelationalDelegate::paint(painter, opt, index); - } else { - const QAbstractItemModel *model = index.model(); - QPalette::ColorGroup cg = (option.state & QStyle::State_Enabled) ? - (option.state & QStyle::State_Active) ? QPalette::Normal : QPalette::Inactive : QPalette::Disabled; - - if (option.state & QStyle::State_Selected) - painter->fillRect(option.rect, option.palette.color(cg, QPalette::Highlight)); - - int rating = model->data(index, Qt::DisplayRole).toInt(); - int width = star.width(); - int height = star.height(); - int x = option.rect.x(); - int y = option.rect.y() + (option.rect.height() / 2) - (height / 2); - for (int i = 0; i < rating; ++i) { - painter->drawPixmap(x, y, star); - x += width; - } - drawFocus(painter, option, option.rect.adjusted(0, 0, -1, -1)); // since we draw the grid ourselves + if (index.column() != 5) { + QStyleOptionViewItemV3 opt = option; + opt.rect.adjust(0, 0, -1, -1); // since we draw the grid ourselves + QSqlRelationalDelegate::paint(painter, opt, index); + } else { + const QAbstractItemModel *model = index.model(); + QPalette::ColorGroup cg = (option.state & QStyle::State_Enabled) + ? (option.state & QStyle::State_Active) + ? QPalette::Normal + : QPalette::Inactive + : QPalette::Disabled; + + if (option.state & QStyle::State_Selected) + painter->fillRect(option.rect, + option.palette.color(cg, QPalette::Highlight)); + + int rating = model->data(index, Qt::DisplayRole).toInt(); + int width = star.width(); + int height = star.height(); + int x = option.rect.x(); + int y = option.rect.y() + (option.rect.height() / 2) - (height / 2); + for (int i = 0; i < rating; ++i) { + painter->drawPixmap(x, y, star); + x += width; } - - QPen pen = painter->pen(); - painter->setPen(option.palette.color(QPalette::Mid)); - painter->drawLine(option.rect.bottomLeft(), option.rect.bottomRight()); - painter->drawLine(option.rect.topRight(), option.rect.bottomRight()); - painter->setPen(pen); + drawFocus( + painter, option, + option.rect.adjusted(0, 0, -1, -1)); // since we draw the grid ourselves + } + + QPen pen = painter->pen(); + painter->setPen(option.palette.color(QPalette::Mid)); + painter->drawLine(option.rect.bottomLeft(), option.rect.bottomRight()); + painter->drawLine(option.rect.topRight(), option.rect.bottomRight()); + painter->setPen(pen); } QSize BookDelegate::sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const + const QModelIndex &index) const { - if (index.column() == 5) - return QSize(5 * star.width(), star.height()) + QSize(1, 1); + if (index.column() == 5) + return QSize(5 * star.width(), star.height()) + QSize(1, 1); - return QSqlRelationalDelegate::sizeHint(option, index) + QSize(1, 1); // since we draw the grid ourselves + return QSqlRelationalDelegate::sizeHint(option, index) + + QSize(1, 1); // since we draw the grid ourselves } bool BookDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) { - if (index.column() != 5) - return QSqlRelationalDelegate::editorEvent(event, model, option, index); + if (index.column() != 5) + return QSqlRelationalDelegate::editorEvent(event, model, option, index); - if (event->type() == QEvent::MouseButtonPress) { - QMouseEvent *mouseEvent = static_cast(event); - int stars = qBound(0, int(0.7 + qreal(mouseEvent->pos().x() - - option.rect.x()) / star.width()), 5); - model->setData(index, QVariant(stars)); - return false; //so that the selection can change - } + if (event->type() == QEvent::MouseButtonPress) { + QMouseEvent *mouseEvent = static_cast(event); + int stars = qBound( + 0, int(0.7 + + qreal(mouseEvent->pos().x() - option.rect.x()) / star.width()), + 5); + model->setData(index, QVariant(stars)); + return false; // so that the selection can change + } - return true; + return true; } -QWidget *BookDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, +QWidget *BookDelegate::createEditor(QWidget *parent, + const QStyleOptionViewItem &option, const QModelIndex &index) const { - if (index.column() != 4) - return QSqlRelationalDelegate::createEditor(parent, option, index); + if (index.column() != 4) + return QSqlRelationalDelegate::createEditor(parent, option, index); - // for editing the year, return a spinbox with a range from -1000 to 2100. - QSpinBox *sb = new QSpinBox(parent); - sb->setFrame(false); - sb->setMaximum(2100); - sb->setMinimum(-1000); + // for editing the year, return a spinbox with a range from -1000 to 2100. + QSpinBox *sb = new QSpinBox(parent); + sb->setFrame(false); + sb->setMaximum(2100); + sb->setMinimum(-1000); - return sb; + return sb; } diff -Nru grantlee5-5.0.0/examples/books/bookdelegate.h grantlee5-5.1.0/examples/books/bookdelegate.h --- grantlee5-5.0.0/examples/books/bookdelegate.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/books/bookdelegate.h 2016-04-19 06:33:17.000000000 +0000 @@ -52,22 +52,23 @@ class BookDelegate : public QSqlRelationalDelegate { public: - BookDelegate(QObject *parent); + BookDelegate(QObject *parent); - void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, + const QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + QSize sizeHint(const QStyleOptionViewItem &option, + const QModelIndex &index) const; - bool editorEvent(QEvent *event, QAbstractItemModel *model, - const QStyleOptionViewItem &option, - const QModelIndex &index); + bool editorEvent(QEvent *event, QAbstractItemModel *model, + const QStyleOptionViewItem &option, + const QModelIndex &index); - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, + const QModelIndex &index) const; private: - QPixmap star; + QPixmap star; }; #endif diff -Nru grantlee5-5.0.0/examples/books/bookwindow.cpp grantlee5-5.1.0/examples/books/bookwindow.cpp --- grantlee5-5.0.0/examples/books/bookwindow.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/books/bookwindow.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -42,159 +42,169 @@ // krazy:excludeall=qclasses #include "bookwindow.h" -#include "bookwrapper.h" #include "bookdelegate.h" -#include "initdb.h" +#include "bookwrapper.h" #include "grantlee_paths.h" +#include "initdb.h" -#include #include #include +#include #include BookWindow::BookWindow() { - ui.setupUi(this); + ui.setupUi(this); - if (!QSqlDatabase::drivers().contains("QSQLITE")) - QMessageBox::critical(this, "Unable to load database", "This demo needs the SQLITE driver"); + if (!QSqlDatabase::drivers().contains("QSQLITE")) + QMessageBox::critical(this, "Unable to load database", + "This demo needs the SQLITE driver"); + + // initialize the database + QSqlError err = initDb(); + if (err.type() != QSqlError::NoError) { + showError(err); + return; + } + + // Create the data model + model = new QSqlRelationalTableModel(ui.bookTable); + model->setEditStrategy(QSqlTableModel::OnManualSubmit); + model->setTable("books"); + + // Rememeber the indexes of the columns + authorIdx = model->fieldIndex("author"); + genreIdx = model->fieldIndex("genre"); + + // Set the relations to the other database tables + model->setRelation(authorIdx, QSqlRelation("authors", "id", "name")); + model->setRelation(genreIdx, QSqlRelation("genres", "id", "name")); + + // Set the localized header captions + model->setHeaderData(authorIdx, Qt::Horizontal, tr("Author Name")); + model->setHeaderData(genreIdx, Qt::Horizontal, tr("Genre")); + model->setHeaderData(model->fieldIndex("title"), Qt::Horizontal, tr("Title")); + model->setHeaderData(model->fieldIndex("year"), Qt::Horizontal, tr("Year")); + model->setHeaderData(model->fieldIndex("rating"), Qt::Horizontal, + tr("Rating")); + + // Populate the model + if (!model->select()) { + showError(model->lastError()); + return; + } + + // Set the model and hide the ID column + ui.bookTable->setModel(model); + ui.bookTable->setItemDelegate(new BookDelegate(ui.bookTable)); + ui.bookTable->setColumnHidden(model->fieldIndex("id"), true); + ui.bookTable->setSelectionMode(QAbstractItemView::SingleSelection); + + // Initialize the Author combo box + ui.authorEdit->setModel(model->relationModel(authorIdx)); + ui.authorEdit->setModelColumn( + model->relationModel(authorIdx)->fieldIndex("name")); + + ui.genreEdit->setModel(model->relationModel(genreIdx)); + ui.genreEdit->setModelColumn( + model->relationModel(genreIdx)->fieldIndex("name")); + + QDataWidgetMapper *mapper = new QDataWidgetMapper(this); + mapper->setModel(model); + mapper->setItemDelegate(new BookDelegate(this)); + mapper->addMapping(ui.titleEdit, model->fieldIndex("title")); + mapper->addMapping(ui.yearEdit, model->fieldIndex("year")); + mapper->addMapping(ui.authorEdit, authorIdx); + mapper->addMapping(ui.genreEdit, genreIdx); + mapper->addMapping(ui.ratingEdit, model->fieldIndex("rating")); + + connect(ui.bookTable->selectionModel(), + SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), mapper, + SLOT(setCurrentModelIndex(QModelIndex))); + + ui.bookTable->setCurrentIndex(model->index(0, 0)); + + ui.exportTheme->insertItems(0, QStringList() << "simple" + << "coloured" + << "simple2" + << "coloured2"); + + connect(ui.exportButton, SIGNAL(pressed()), SLOT(renderBooks())); + + m_engine = new Grantlee::Engine(); + QSharedPointer loader + = QSharedPointer( + new Grantlee::FileSystemTemplateLoader()); + loader->setTemplateDirs(QStringList() << GRANTLEE_TEMPLATE_PATH); + m_engine->addTemplateLoader(loader); - // initialize the database - QSqlError err = initDb(); - if (err.type() != QSqlError::NoError) { - showError(err); - return; - } - - // Create the data model - model = new QSqlRelationalTableModel(ui.bookTable); - model->setEditStrategy(QSqlTableModel::OnManualSubmit); - model->setTable("books"); - - // Rememeber the indexes of the columns - authorIdx = model->fieldIndex("author"); - genreIdx = model->fieldIndex("genre"); - - // Set the relations to the other database tables - model->setRelation(authorIdx, QSqlRelation("authors", "id", "name")); - model->setRelation(genreIdx, QSqlRelation("genres", "id", "name")); - - // Set the localized header captions - model->setHeaderData(authorIdx, Qt::Horizontal, tr("Author Name")); - model->setHeaderData(genreIdx, Qt::Horizontal, tr("Genre")); - model->setHeaderData(model->fieldIndex("title"), Qt::Horizontal, tr("Title")); - model->setHeaderData(model->fieldIndex("year"), Qt::Horizontal, tr("Year")); - model->setHeaderData(model->fieldIndex("rating"), Qt::Horizontal, tr("Rating")); - - // Populate the model - if (!model->select()) { - showError(model->lastError()); - return; - } - - // Set the model and hide the ID column - ui.bookTable->setModel(model); - ui.bookTable->setItemDelegate(new BookDelegate(ui.bookTable)); - ui.bookTable->setColumnHidden(model->fieldIndex("id"), true); - ui.bookTable->setSelectionMode(QAbstractItemView::SingleSelection); - - // Initialize the Author combo box - ui.authorEdit->setModel(model->relationModel(authorIdx)); - ui.authorEdit->setModelColumn(model->relationModel(authorIdx)->fieldIndex("name")); - - ui.genreEdit->setModel(model->relationModel(genreIdx)); - ui.genreEdit->setModelColumn(model->relationModel(genreIdx)->fieldIndex("name")); - - QDataWidgetMapper *mapper = new QDataWidgetMapper(this); - mapper->setModel(model); - mapper->setItemDelegate(new BookDelegate(this)); - mapper->addMapping(ui.titleEdit, model->fieldIndex("title")); - mapper->addMapping(ui.yearEdit, model->fieldIndex("year")); - mapper->addMapping(ui.authorEdit, authorIdx); - mapper->addMapping(ui.genreEdit, genreIdx); - mapper->addMapping(ui.ratingEdit, model->fieldIndex("rating")); - - connect(ui.bookTable->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), - mapper, SLOT(setCurrentModelIndex(QModelIndex))); - - ui.bookTable->setCurrentIndex(model->index(0, 0)); - - ui.exportTheme->insertItems(0, QStringList() << "simple" << "coloured" << "simple2" << "coloured2" ); - - connect(ui.exportButton, SIGNAL(pressed()), SLOT(renderBooks())); - - m_engine = new Grantlee::Engine(); - QSharedPointer loader = QSharedPointer( new Grantlee::FileSystemTemplateLoader() ); - loader->setTemplateDirs( QStringList() << GRANTLEE_TEMPLATE_PATH ); - m_engine->addTemplateLoader(loader); - - m_engine->setPluginPaths( QStringList() << GRANTLEE_PLUGIN_PATH ); + m_engine->setPluginPaths(QStringList() << GRANTLEE_PLUGIN_PATH); } void BookWindow::showError(const QSqlError &err) { - QMessageBox::critical(this, "Unable to initialize Database", - "Error initializing database: " + err.text()); + QMessageBox::critical(this, "Unable to initialize Database", + "Error initializing database: " + err.text()); } void BookWindow::renderBooks() const { - int rows = model->rowCount(); - QVariantHash mapping; - QVariantList bookList; - for (int row = 0; row < rows; ++row) - { - QString title = model->index(row, 1).data().toString(); - QString author = model->index(row, 2).data().toString(); - QString genre = model->index(row, 3).data().toString(); - int rating = model->index(row, 5).data().toInt(); - QObject *book = new BookWrapper(author, title, genre, rating, this); - QVariant var = QVariant::fromValue(book); - bookList.append(var); - } - mapping.insert("books", bookList); - - QString themeName = ui.exportTheme->currentText(); - - Grantlee::Context c(mapping); - - Grantlee::Template t = m_engine->loadByName( themeName + ".html" ); - if (!t) - { - QMessageBox::critical(this, "Unable to load template", - QString( "Error loading template: %1" ).arg( themeName + ".html" ) ); - return; - } - - if ( t->error() ) - { - QMessageBox::critical(this, "Unable to load template", - QString( "Error loading template: %1" ).arg( t->errorString() ) ); - return; - } - - bool ok; - QString text = QInputDialog::getText(this, tr("Export Location"), - tr("file name:"), QLineEdit::Normal, - QDir::home().absolutePath() + "/book_export.html", &ok); - if (!ok || text.isEmpty()) - return; - - QFile file( text ); - if ( !file.open( QIODevice::WriteOnly | QIODevice::Text ) ) - return; - - QString content = t->render(&c); - - if ( t->error() ) - { - QMessageBox::critical(this, "Unable render template", - QString( "Error rendering template: %1" ).arg( t->errorString() ) ); - return; - } - - file.write(content.toLocal8Bit()); - file.close(); + int rows = model->rowCount(); + QVariantHash mapping; + QVariantList bookList; + for (int row = 0; row < rows; ++row) { + QString title = model->index(row, 1).data().toString(); + QString author = model->index(row, 2).data().toString(); + QString genre = model->index(row, 3).data().toString(); + int rating = model->index(row, 5).data().toInt(); + QObject *book = new BookWrapper(author, title, genre, rating, + const_cast(this)); + QVariant var = QVariant::fromValue(book); + bookList.append(var); + } + mapping.insert("books", bookList); + + QString themeName = ui.exportTheme->currentText(); + + Grantlee::Context c(mapping); + + Grantlee::Template t = m_engine->loadByName(themeName + ".html"); + if (!t) { + QMessageBox::critical( + const_cast(this), "Unable to load template", + QString("Error loading template: %1").arg(themeName + ".html")); + return; + } + + if (t->error()) { + QMessageBox::critical( + const_cast(this), "Unable to load template", + QString("Error loading template: %1").arg(t->errorString())); + return; + } + + bool ok; + QString text = QInputDialog::getText( + const_cast(this), tr("Export Location"), tr("file name:"), + QLineEdit::Normal, QDir::home().absolutePath() + "/book_export.html", + &ok); + if (!ok || text.isEmpty()) + return; + + QFile file(text); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) + return; + + QString content = t->render(&c); + + if (t->error()) { + QMessageBox::critical( + const_cast(this), "Unable render template", + QString("Error rendering template: %1").arg(t->errorString())); + return; + } + file.write(content.toLocal8Bit()); + file.close(); } diff -Nru grantlee5-5.0.0/examples/books/bookwindow.h grantlee5-5.1.0/examples/books/bookwindow.h --- grantlee5-5.0.0/examples/books/bookwindow.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/books/bookwindow.h 2016-04-19 06:33:17.000000000 +0000 @@ -54,21 +54,21 @@ class Engine; } -class BookWindow: public QMainWindow +class BookWindow : public QMainWindow { - Q_OBJECT + Q_OBJECT public: - BookWindow(); + BookWindow(); protected Q_SLOTS: - void renderBooks() const; + void renderBooks() const; private: - void showError(const QSqlError &err); - Ui::BookWindow ui; - QSqlRelationalTableModel *model; - int authorIdx, genreIdx; - Grantlee::Engine *m_engine; + void showError(const QSqlError &err); + Ui::BookWindow ui; + QSqlRelationalTableModel *model; + int authorIdx, genreIdx; + Grantlee::Engine *m_engine; }; #endif diff -Nru grantlee5-5.0.0/examples/books/bookwrapper.cpp grantlee5-5.1.0/examples/books/bookwrapper.cpp --- grantlee5-5.0.0/examples/books/bookwrapper.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/books/bookwrapper.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -18,5 +18,4 @@ */ - #include "bookwrapper.h" diff -Nru grantlee5-5.0.0/examples/books/bookwrapper.h grantlee5-5.1.0/examples/books/bookwrapper.h --- grantlee5-5.0.0/examples/books/bookwrapper.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/books/bookwrapper.h 2016-04-19 06:33:17.000000000 +0000 @@ -31,9 +31,12 @@ Q_PROPERTY(QString genre READ genre) Q_PROPERTY(int rating READ rating) public: - BookWrapper(QString author, QString title, QString genre, int rating, QObject *parent = 0) - : QObject(parent), m_author(author), m_title(title), m_genre(genre), m_rating(rating) - {} + BookWrapper(QString author, QString title, QString genre, int rating, + QObject *parent = 0) + : QObject(parent), m_author(author), m_title(title), m_genre(genre), + m_rating(rating) + { + } QString author() { return m_author; } QString title() { return m_title; } diff -Nru grantlee5-5.0.0/examples/books/initdb.h grantlee5-5.1.0/examples/books/initdb.h --- grantlee5-5.0.0/examples/books/initdb.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/books/initdb.h 2016-04-19 06:33:17.000000000 +0000 @@ -44,82 +44,92 @@ #include -void addBook(QSqlQuery &q, const QString &title, int year, const QVariant &authorId, - const QVariant &genreId, int rating) +void addBook(QSqlQuery &q, const QString &title, int year, + const QVariant &authorId, const QVariant &genreId, int rating) { - q.addBindValue(title); - q.addBindValue(year); - q.addBindValue(authorId); - q.addBindValue(genreId); - q.addBindValue(rating); - q.exec(); + q.addBindValue(title); + q.addBindValue(year); + q.addBindValue(authorId); + q.addBindValue(genreId); + q.addBindValue(rating); + q.exec(); } QVariant addGenre(QSqlQuery &q, const QString &name) { - q.addBindValue(name); - q.exec(); - return q.lastInsertId(); + q.addBindValue(name); + q.exec(); + return q.lastInsertId(); } QVariant addAuthor(QSqlQuery &q, const QString &name, const QDate &birthdate) { - q.addBindValue(name); - q.addBindValue(birthdate); - q.exec(); - return q.lastInsertId(); + q.addBindValue(name); + q.addBindValue(birthdate); + q.exec(); + return q.lastInsertId(); } QSqlError initDb() { - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); - db.setDatabaseName(":memory:"); + QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + db.setDatabaseName(":memory:"); - if (!db.open()) - return db.lastError(); - - QStringList tables = db.tables(); - if (tables.contains("books", Qt::CaseInsensitive) - && tables.contains("authors", Qt::CaseInsensitive)) - return QSqlError(); - - QSqlQuery q; - if (!q.exec(QStringLiteral("create table books(id integer primary key, title varchar, author integer, genre integer, year integer, rating integer)"))) - return q.lastError(); - if (!q.exec(QStringLiteral("create table authors(id integer primary key, name varchar, birthdate date)"))) - return q.lastError(); - if (!q.exec(QStringLiteral("create table genres(id integer primary key, name varchar)"))) - return q.lastError(); - - if (!q.prepare(QStringLiteral("insert into authors(name, birthdate) values(?, ?)"))) - return q.lastError(); - QVariant asimovId = addAuthor(q, QStringLiteral("Isaac Asimov"), QDate(1920, 2, 1)); - QVariant greeneId = addAuthor(q, QStringLiteral("Graham Greene"), QDate(1904, 10, 2)); - QVariant pratchettId = addAuthor(q, QStringLiteral("Terry Pratchett"), QDate(1948, 4, 28)); - - if (!q.prepare(QStringLiteral("insert into genres(name) values(?)"))) - return q.lastError(); - QVariant sfiction = addGenre(q, QStringLiteral("Science Fiction")); - QVariant fiction = addGenre(q, QStringLiteral("Fiction")); - QVariant fantasy = addGenre(q, QStringLiteral("Fantasy")); - - if (!q.prepare(QStringLiteral("insert into books(title, year, author, genre, rating) values(?, ?, ?, ?, ?)"))) - return q.lastError(); - addBook(q, QStringLiteral("Foundation"), 1951, asimovId, sfiction, 3); - addBook(q, QStringLiteral("Foundation and Empire"), 1952, asimovId, sfiction, 4); - addBook(q, QStringLiteral("Second Foundation"), 1953, asimovId, sfiction, 3); - addBook(q, QStringLiteral("Foundation's Edge"), 1982, asimovId, sfiction, 3); - addBook(q, QStringLiteral("Foundation and Earth"), 1986, asimovId, sfiction, 4); - addBook(q, QStringLiteral("Prelude to Foundation"), 1988, asimovId, sfiction, 3); - addBook(q, QStringLiteral("Forward the Foundation"), 1993, asimovId, sfiction, 3); - addBook(q, QStringLiteral("The Power and the Glory"), 1940, greeneId, fiction, 4); - addBook(q, QStringLiteral("The Third Man"), 1950, greeneId, fiction, 5); - addBook(q, QStringLiteral("Our Man in Havana"), 1958, greeneId, fiction, 4); - addBook(q, QStringLiteral("Guards! Guards!"), 1989, pratchettId, fantasy, 3); - addBook(q, QStringLiteral("Night Watch"), 2002, pratchettId, fantasy, 3); - addBook(q, QStringLiteral("Going Postal"), 2004, pratchettId, fantasy, 3); + if (!db.open()) + return db.lastError(); + QStringList tables = db.tables(); + if (tables.contains("books", Qt::CaseInsensitive) + && tables.contains("authors", Qt::CaseInsensitive)) return QSqlError(); + + QSqlQuery q; + if (!q.exec(QStringLiteral("create table books(id integer primary key, title varchar, author integer, genre integer, year integer, rating integer)"))) + return q.lastError(); + if (!q.exec(QStringLiteral("create table authors(id integer primary key, name varchar, birthdate date)"))) + return q.lastError(); + if (!q.exec(QStringLiteral( + "create table genres(id integer primary key, name varchar)"))) + return q.lastError(); + + if (!q.prepare( + QStringLiteral("insert into authors(name, birthdate) values(?, ?)"))) + return q.lastError(); + QVariant asimovId + = addAuthor(q, QStringLiteral("Isaac Asimov"), QDate(1920, 2, 1)); + QVariant greeneId + = addAuthor(q, QStringLiteral("Graham Greene"), QDate(1904, 10, 2)); + QVariant pratchettId + = addAuthor(q, QStringLiteral("Terry Pratchett"), QDate(1948, 4, 28)); + + if (!q.prepare(QStringLiteral("insert into genres(name) values(?)"))) + return q.lastError(); + QVariant sfiction = addGenre(q, QStringLiteral("Science Fiction")); + QVariant fiction = addGenre(q, QStringLiteral("Fiction")); + QVariant fantasy = addGenre(q, QStringLiteral("Fantasy")); + + if (!q.prepare(QStringLiteral("insert into books(title, year, author, genre, rating) values(?, ?, ?, ?, ?)"))) + return q.lastError(); + addBook(q, QStringLiteral("Foundation"), 1951, asimovId, sfiction, 3); + addBook(q, QStringLiteral("Foundation and Empire"), 1952, asimovId, sfiction, + 4); + addBook(q, QStringLiteral("Second Foundation"), 1953, asimovId, sfiction, 3); + addBook(q, QStringLiteral("Foundation's Edge"), 1982, asimovId, sfiction, 3); + addBook(q, QStringLiteral("Foundation and Earth"), 1986, asimovId, sfiction, + 4); + addBook(q, QStringLiteral("Prelude to Foundation"), 1988, asimovId, sfiction, + 3); + addBook(q, QStringLiteral("Forward the Foundation"), 1993, asimovId, sfiction, + 3); + addBook(q, QStringLiteral("The Power and the Glory"), 1940, greeneId, fiction, + 4); + addBook(q, QStringLiteral("The Third Man"), 1950, greeneId, fiction, 5); + addBook(q, QStringLiteral("Our Man in Havana"), 1958, greeneId, fiction, 4); + addBook(q, QStringLiteral("Guards! Guards!"), 1989, pratchettId, fantasy, 3); + addBook(q, QStringLiteral("Night Watch"), 2002, pratchettId, fantasy, 3); + addBook(q, QStringLiteral("Going Postal"), 2004, pratchettId, fantasy, 3); + + return QSqlError(); } #endif diff -Nru grantlee5-5.0.0/examples/books/main.cpp grantlee5-5.1.0/examples/books/main.cpp --- grantlee5-5.0.0/examples/books/main.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/books/main.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -43,14 +43,14 @@ #include -int main(int argc, char * argv[]) +int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(books); + Q_INIT_RESOURCE(books); - QApplication app(argc, argv); + QApplication app(argc, argv); - BookWindow win; - win.show(); + BookWindow win; + win.show(); - return app.exec(); + return app.exec(); } diff -Nru grantlee5-5.0.0/examples/codegen/codegentableview.cpp grantlee5-5.1.0/examples/codegen/codegentableview.cpp --- grantlee5-5.0.0/examples/codegen/codegentableview.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/codegentableview.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -23,8 +23,7 @@ #include "comboboxdelegate.h" #include -MethodTableView::MethodTableView(QWidget* parent) - : QTableView(parent) +MethodTableView::MethodTableView(QWidget *parent) : QTableView(parent) { QStringList accessTypes; accessTypes << "public" @@ -40,25 +39,25 @@ QStringList types; types << "void"; - for ( int i = 0; i < sizeof sTypes / sizeof *sTypes; ++i) + for (int i = 0; i < sizeof sTypes / sizeof *sTypes; ++i) types << *(sTypes + i); - setItemDelegateForColumn(2, new ComboBoxDelegate(types, ComboBoxDelegate::Editable)); + setItemDelegateForColumn( + 2, new ComboBoxDelegate(types, ComboBoxDelegate::Editable)); setEditTriggers(QAbstractItemView::AllEditTriggers); horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); } -ArgsTableView::ArgsTableView(QWidget* parent) - : QTableView(parent) +ArgsTableView::ArgsTableView(QWidget *parent) : QTableView(parent) { QStringList types; - for ( int i = 0; i < sizeof sTypes / sizeof *sTypes; ++i) + for (int i = 0; i < sizeof sTypes / sizeof *sTypes; ++i) types << *(sTypes + i); - setItemDelegateForColumn(0, new ComboBoxDelegate(types, ComboBoxDelegate::Editable)); + setItemDelegateForColumn( + 0, new ComboBoxDelegate(types, ComboBoxDelegate::Editable)); setEditTriggers(QAbstractItemView::AllEditTriggers); horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); - } diff -Nru grantlee5-5.0.0/examples/codegen/codegentableview.h grantlee5-5.1.0/examples/codegen/codegentableview.h --- grantlee5-5.0.0/examples/codegen/codegentableview.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/codegentableview.h 2016-04-19 06:33:17.000000000 +0000 @@ -27,15 +27,14 @@ { Q_OBJECT public: - MethodTableView(QWidget* parent = 0); + MethodTableView(QWidget *parent = 0); }; class ArgsTableView : public QTableView { Q_OBJECT public: - ArgsTableView(QWidget* parent = 0); - + ArgsTableView(QWidget *parent = 0); }; #endif diff -Nru grantlee5-5.0.0/examples/codegen/comboboxdelegate.cpp grantlee5-5.1.0/examples/codegen/comboboxdelegate.cpp --- grantlee5-5.0.0/examples/codegen/comboboxdelegate.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/comboboxdelegate.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -21,25 +21,23 @@ #include "comboboxdelegate.h" #include "comboboxdelegate_p.h" +#include #include -ComboBoxEditorCreator::ComboBoxEditorCreator(const QStringList &data, ComboBoxDelegate::Type type) +ComboBoxEditorCreator::ComboBoxEditorCreator(const QStringList &data, + ComboBoxDelegate::Type type) : QItemEditorCreatorBase(), m_data(data), m_type(type) { - } -ComboBoxEditorCreator::~ComboBoxEditorCreator() -{ - -} +ComboBoxEditorCreator::~ComboBoxEditorCreator() {} -QWidget* ComboBoxEditorCreator::createWidget(QWidget *parent) const +QWidget *ComboBoxEditorCreator::createWidget(QWidget *parent) const { ViewComboBox *vcb = new ViewComboBox(parent); vcb->addItems(m_data); - if(m_type == ComboBoxDelegate::Editable) + if (m_type == ComboBoxDelegate::Editable) vcb->setEditable(true); return vcb; @@ -50,18 +48,11 @@ return QByteArray("choice"); } -ViewComboBox::ViewComboBox(QWidget* parent) - : QComboBox(parent) -{ +ViewComboBox::ViewComboBox(QWidget *parent) : QComboBox(parent) {} -} +QString ViewComboBox::choice() const { return currentText(); } -QString ViewComboBox::choice() const -{ - return currentText(); -} - -void ViewComboBox::setChoice(const QString& choice) +void ViewComboBox::setChoice(const QString &choice) { const int index = findData(choice, Qt::DisplayRole, Qt::MatchFixedString); if (index >= 0) @@ -70,8 +61,9 @@ setEditText(choice); } -ComboBoxDelegate::ComboBoxDelegate(const QStringList &data, Type type, QObject* parent) - : QItemDelegate(parent) +ComboBoxDelegate::ComboBoxDelegate(const QStringList &data, Type type, + QObject *parent) + : QItemDelegate(parent) { QItemEditorFactory *factory = new QItemEditorFactory; QItemEditorCreatorBase *creator = new ComboBoxEditorCreator(data, type); @@ -80,7 +72,9 @@ setItemEditorFactory(factory); } -QWidget* ComboBoxDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const +QWidget *ComboBoxDelegate::createEditor(QWidget *parent, + const QStyleOptionViewItem &option, + const QModelIndex &index) const { QWidget *w = QItemDelegate::createEditor(parent, option, index); ViewComboBox *viewComboBox = qobject_cast(w); @@ -88,16 +82,39 @@ return viewComboBox; } -QSize ComboBoxDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const +static QSize textSize(const QFont &font, const QString &text) { - QWidget *w = QItemDelegate::createEditor(0, option, index); - ViewComboBox *viewComboBox = qobject_cast(w); - if (!viewComboBox) - return QItemDelegate::sizeHint(option, index); - QSize s = viewComboBox->sizeHint(); - delete w; - return s; -} + QFontMetrics fm(font); + QSize size = fm.size(Qt::TextSingleLine, text); + const int textMargin + = QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1; + return QSize(size.width() + 2 * textMargin, size.height()); +} + +QSize ComboBoxDelegate::sizeHint(const QStyleOptionViewItem &option, + const QModelIndex &index) const +{ + if (m_sizes.contains(index.row())) { + return m_sizes.value(index.row()); + } + QSize sz; + QVariant fontData = index.data(Qt::FontRole); + QFont fnt = qvariant_cast(fontData).resolve(option.font); + for (int i = 0; i < sizeof sTypes / sizeof *sTypes; ++i) { + QString text = *(sTypes + i); + QSize s = textSize(fnt, text); + sz = sz.expandedTo(s); + } + + QStyleOptionComboBox opt; + opt.editable = true; + opt.frame = true; + opt.currentText = index.data().toString(); + + sz = qApp->style()->sizeFromContents(QStyle::CT_ComboBox, &opt, sz); + m_sizes.insert(index.row(), sz); + return sz; +} #include "moc_comboboxdelegate_p.cpp" diff -Nru grantlee5-5.0.0/examples/codegen/comboboxdelegate.h grantlee5-5.1.0/examples/codegen/comboboxdelegate.h --- grantlee5-5.0.0/examples/codegen/comboboxdelegate.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/comboboxdelegate.h 2016-04-19 06:33:17.000000000 +0000 @@ -23,40 +23,28 @@ #include -static const char * sTypes[] = { - "int", - "qreal", - "QString", - "QStringList", - "QDateTime", - "QPoint", - "QFile", - "QDir", - "QUrl", - "QSize", - "QRect", - "QObject *", - "QVariant", - "QModelIndex", - "QColor", - "QWidget *", - "QAction *", - "QModelIndex" -}; +static const char *sTypes[] + = {"int", "qreal", "QString", "QStringList", "QDateTime", + "QPoint", "QFile", "QDir", "QUrl", "QSize", + "QRect", "QObject *", "QVariant", "QModelIndex", "QColor", + "QWidget *", "QAction *", "QModelIndex"}; class ComboBoxDelegate : public QItemDelegate { Q_OBJECT public: - enum Type - { - NotEditable, - Editable - }; - ComboBoxDelegate(const QStringList &data, Type type = NotEditable, QObject* parent = 0); + enum Type { NotEditable, Editable }; + ComboBoxDelegate(const QStringList &data, Type type = NotEditable, + QObject *parent = 0); + + virtual QWidget *createEditor(QWidget *parent, + const QStyleOptionViewItem &option, + const QModelIndex &index) const; + virtual QSize sizeHint(const QStyleOptionViewItem &option, + const QModelIndex &index) const; - virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const; - virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const; +private: + mutable QHash m_sizes; }; #endif diff -Nru grantlee5-5.0.0/examples/codegen/comboboxdelegate_p.h grantlee5-5.1.0/examples/codegen/comboboxdelegate_p.h --- grantlee5-5.0.0/examples/codegen/comboboxdelegate_p.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/comboboxdelegate_p.h 2016-04-19 06:33:17.000000000 +0000 @@ -30,7 +30,8 @@ class ComboBoxEditorCreator : public QItemEditorCreatorBase { public: - explicit ComboBoxEditorCreator(const QStringList &data, ComboBoxDelegate::Type type); + explicit ComboBoxEditorCreator(const QStringList &data, + ComboBoxDelegate::Type type); virtual ~ComboBoxEditorCreator(); /* reimp */ QWidget *createWidget(QWidget *parent) const; @@ -47,7 +48,7 @@ Q_OBJECT Q_PROPERTY(QString choice READ choice WRITE setChoice) public: - explicit ViewComboBox(QWidget* parent = 0); + explicit ViewComboBox(QWidget *parent = 0); QString choice() const; void setChoice(const QString &choice); diff -Nru grantlee5-5.0.0/examples/codegen/designwidget.cpp grantlee5-5.1.0/examples/codegen/designwidget.cpp --- grantlee5-5.0.0/examples/codegen/designwidget.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/designwidget.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -18,17 +18,16 @@ */ - #include "designwidget.h" #include "codegentableview.h" -#include "methodmodel.h" #include "comboboxdelegate.h" +#include "methodmodel.h" #include -DesignWidget::DesignWidget(QWidget* parent, Qt::WindowFlags f) - : QWidget(parent, f) +DesignWidget::DesignWidget(QWidget *parent, Qt::WindowFlags f) + : QWidget(parent, f) { ui.setupUi(this); setInitialContent(); @@ -52,36 +51,44 @@ QList args; m_methodModel = new MethodModel(this); - insertMethod("public", false, "QString", "getResult", true ); - args << ( QStringList() << "QString" << "silly" ); - args << ( QStringList() << "int" << "number" << "9" ); - insertMethod("public slots", false, "void", "somethingStupid", false, args ); - insertMethod("protected", false, "void", "reset", false ); + insertMethod("public", false, "QString", "getResult", true); + args << (QStringList() << "QString" + << "silly"); + args << (QStringList() << "int" + << "number" + << "9"); + insertMethod("public slots", false, "void", "somethingStupid", false, args); + insertMethod("protected", false, "void", "reset", false); args.clear(); - args << ( QStringList() << "int" << "var" ); - args << ( QStringList() << "QString" << "input" << "QString()" ); - insertMethod("protected", false, "QModelIndex", "findIndex", true, args ); - insertMethod("protected", true, "void", "clear", false ); - insertMethod("private", false, "void", "internalMethod", true ); + args << (QStringList() << "int" + << "var"); + args << (QStringList() << "QString" + << "input" + << "QString()"); + insertMethod("protected", false, "QModelIndex", "findIndex", true, args); + insertMethod("protected", true, "void", "clear", false); + insertMethod("private", false, "void", "internalMethod", true); ui.methods_table->setModel(m_methodModel); - connect( ui.methods_table->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), SLOT(setArgsRootIndex(QModelIndex))); + connect(ui.methods_table->selectionModel(), + SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), + SLOT(setArgsRootIndex(QModelIndex))); m_argsModel = new ArgsModel(this); m_argsModel->setSourceModel(m_methodModel); setArgsRootIndex(QModelIndex()); - connect( ui.pushButton, SIGNAL(clicked(bool)), SIGNAL(generateClicked(bool))); + connect(ui.pushButton, SIGNAL(clicked(bool)), SIGNAL(generateClicked(bool))); } -void DesignWidget::insertMethod(const QString& access, bool _virtual, const QString& type, const QString& name, bool _const, QList args) +void DesignWidget::insertMethod(const QString &access, bool _virtual, + const QString &type, const QString &name, + bool _const, QList args) { - QList method; - method << new QStandardItem(access) - << new QStandardItem() - << new QStandardItem(type) - << new QStandardItem(name) + QList method; + method << new QStandardItem(access) << new QStandardItem() + << new QStandardItem(type) << new QStandardItem(name) << new QStandardItem(); method.at(1)->setEditable(false); @@ -91,13 +98,10 @@ method.at(1)->setCheckState(_virtual ? Qt::Checked : Qt::Unchecked); method.at(4)->setCheckState(_const ? Qt::Checked : Qt::Unchecked); - if (!args.isEmpty()) - { - Q_FOREACH(const QStringList &arg, args) - { - QList argItem; - argItem << new QStandardItem(arg.at(0)) - << new QStandardItem(arg.at(1)) + if (!args.isEmpty()) { + Q_FOREACH (const QStringList &arg, args) { + QList argItem; + argItem << new QStandardItem(arg.at(0)) << new QStandardItem(arg.at(1)) << new QStandardItem(arg.value(2)); method.first()->appendRow(argItem); } @@ -106,7 +110,8 @@ m_methodModel->appendRow(method); } -void DesignWidget::insertProperty(int row, const QString& type, const QString& name, bool readonly) +void DesignWidget::insertProperty(int row, const QString &type, + const QString &name, bool readonly) { ui.properties_table->setItem(row, 0, new QTableWidgetItem(type)); ui.properties_table->setItem(row, 1, new QTableWidgetItem(name)); @@ -120,7 +125,8 @@ void DesignWidget::setArgsRootIndex(const QModelIndex &index) { ui.args_table->setModel(index.isValid() ? m_argsModel : 0); - ui.args_table->setRootIndex(m_argsModel->mapFromSource(index.sibling(index.row(), 0))); + ui.args_table->setRootIndex( + m_argsModel->mapFromSource(index.sibling(index.row(), 0))); } Grantlee::Context DesignWidget::getContext() @@ -133,8 +139,7 @@ c.insert("qobject", true); c.insert("licence", ui.licence_combo->currentText()); - if ( ui.baseClassAccess->currentText() != "None" ) - { + if (ui.baseClassAccess->currentText() != "None") { QVariantHash baseClass; baseClass.insert("module", ui.baseModule->currentText()); baseClass.insert("access", ui.baseClassAccess->currentText()); @@ -143,36 +148,35 @@ } QVariantList properties; - for (int row = 0; row < ui.properties_table->rowCount(); ++row ) - { + for (int row = 0; row < ui.properties_table->rowCount(); ++row) { QVariantHash property; property.insert("type", ui.properties_table->item(row, 0)->text()); property.insert("name", ui.properties_table->item(row, 1)->text()); - property.insert("readonly", ui.properties_table->item(row, 2)->checkState() == Qt::Checked); + property.insert("readonly", ui.properties_table->item(row, 2)->checkState() + == Qt::Checked); properties << property; } - c.insert( "properties", QVariant( properties ) ); + c.insert("properties", QVariant(properties)); QVariantList methods; - for (int row = 0; row < m_methodModel->rowCount(); ++row) - { + for (int row = 0; row < m_methodModel->rowCount(); ++row) { QVariantHash method; QStandardItem *firstColumn = m_methodModel->item(row, 0); method.insert("accessType", firstColumn->text()); - method.insert("virtual", m_methodModel->item(row, 1)->checkState() == Qt::Checked); + method.insert("virtual", + m_methodModel->item(row, 1)->checkState() == Qt::Checked); method.insert("type", m_methodModel->item(row, 2)->text()); method.insert("name", m_methodModel->item(row, 3)->text()); - method.insert("const", m_methodModel->item(row, 4)->checkState() == Qt::Checked); + method.insert("const", + m_methodModel->item(row, 4)->checkState() == Qt::Checked); - if (firstColumn->hasChildren()) - { + if (firstColumn->hasChildren()) { QVariantList args; - for (int argRow = 0; argRow < firstColumn->rowCount(); ++argRow ) - { + for (int argRow = 0; argRow < firstColumn->rowCount(); ++argRow) { QVariantHash arg; arg.insert("type", firstColumn->child(argRow, 0)->text()); @@ -186,7 +190,7 @@ methods << method; } - c.insert( "methods", QVariant( methods ) ); + c.insert("methods", QVariant(methods)); return c; } diff -Nru grantlee5-5.0.0/examples/codegen/designwidget.h grantlee5-5.1.0/examples/codegen/designwidget.h --- grantlee5-5.0.0/examples/codegen/designwidget.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/designwidget.h 2016-04-19 06:33:17.000000000 +0000 @@ -34,7 +34,7 @@ { Q_OBJECT public: - DesignWidget(QWidget* parent = 0, Qt::WindowFlags f = 0); + DesignWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); Grantlee::Context getContext(); @@ -45,8 +45,11 @@ private: void setInitialContent(); - void insertProperty(int row, const QString &type, const QString &name, bool readonly); - void insertMethod(const QString &access, bool _virtual, const QString &type, const QString &name, bool _const, QList args = QList()); + void insertProperty(int row, const QString &type, const QString &name, + bool readonly); + void insertMethod(const QString &access, bool _virtual, const QString &type, + const QString &name, bool _const, + QList args = QList()); private Q_SLOTS: void setArgsRootIndex(const QModelIndex &index); diff -Nru grantlee5-5.0.0/examples/codegen/main.cpp grantlee5-5.1.0/examples/codegen/main.cpp --- grantlee5-5.0.0/examples/codegen/main.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/main.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -22,13 +22,13 @@ #include -int main(int argc, char * argv[]) +int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QApplication app(argc, argv); - MainWindow mw; - mw.show(); - mw.resize(1200, 770); + MainWindow mw; + mw.show(); + mw.resize(1200, 770); - return app.exec(); + return app.exec(); } diff -Nru grantlee5-5.0.0/examples/codegen/mainwindow.cpp grantlee5-5.1.0/examples/codegen/mainwindow.cpp --- grantlee5-5.0.0/examples/codegen/mainwindow.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/mainwindow.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -20,14 +20,14 @@ #include "mainwindow.h" -#include #include +#include #include #include -#include "grantlee_templates.h" #include "grantlee_paths.h" +#include "grantlee_templates.h" #include "designwidget.h" @@ -39,29 +39,20 @@ class NoEscapeOutputStream : public Grantlee::OutputStream { public: - NoEscapeOutputStream() - : Grantlee::OutputStream() - { + NoEscapeOutputStream() : Grantlee::OutputStream() {} - } + NoEscapeOutputStream(QTextStream *stream) : OutputStream(stream) {} - NoEscapeOutputStream(QTextStream* stream) - : OutputStream( stream ) + virtual QSharedPointer clone() const { - + return QSharedPointer(new NoEscapeOutputStream); } - virtual QSharedPointer< Grantlee::OutputStream > clone() const { - return QSharedPointer( new NoEscapeOutputStream ); - } - - virtual QString escape( const QString& input ) const { - return input; - } + virtual QString escape(const QString &input) const { return input; } }; -MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags) - : QMainWindow(parent, flags) +MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags) + : QMainWindow(parent, flags) { QSplitter *splitter = new QSplitter(this); splitter->setStretchFactor(1, 5); @@ -75,38 +66,38 @@ setCentralWidget(splitter); - connect(m_designWidget, SIGNAL(generateClicked(bool)), SLOT(generateOutput())); + connect(m_designWidget, SIGNAL(generateClicked(bool)), + SLOT(generateOutput())); m_engine = new Grantlee::Engine(this); - m_engine->setPluginPaths( QStringList() << GRANTLEE_PLUGIN_PATH << ":/plugins" ); - m_engine->addDefaultLibrary( "grantlee_scriptabletags" ); + m_engine->setPluginPaths(QStringList() << GRANTLEE_PLUGIN_PATH + << ":/plugins"); + m_engine->addDefaultLibrary("grantlee_scriptabletags"); m_engine->setSmartTrimEnabled(true); - m_loader = QSharedPointer( new Grantlee::FileSystemTemplateLoader ); - m_loader->setTemplateDirs( QStringList() << ":/templates" ); + m_loader = QSharedPointer( + new Grantlee::FileSystemTemplateLoader); + m_loader->setTemplateDirs(QStringList() << ":/templates"); m_engine->addTemplateLoader(m_loader); m_engine->addDefaultLibrary("custom_tags"); } -MainWindow::~MainWindow() -{ - -} +MainWindow::~MainWindow() {} void MainWindow::generateOutput() { m_tabWidget->clear(); QString outputType = m_designWidget->outputType(); - m_loader->setTheme( outputType ); + m_loader->setTheme(outputType); if (outputType == "cpp") return generateCpp(); - Grantlee::Template classTemplate = m_engine->loadByName("class." + outputType); + Grantlee::Template classTemplate + = m_engine->loadByName("class." + outputType); - if (classTemplate->error()) - { + if (classTemplate->error()) { createOutputTab("Class", classTemplate->errorString()); return; } @@ -118,15 +109,15 @@ NoEscapeOutputStream stream(&textStream); classTemplate->render(&stream, &c); - createOutputTab("Class", classTemplate->error() ? classTemplate->errorString() : output); + createOutputTab("Class", classTemplate->error() ? classTemplate->errorString() + : output); } void MainWindow::generateCpp() { Grantlee::Template headerTemplate = m_engine->loadByName("header.h"); - if (headerTemplate->error()) - { + if (headerTemplate->error()) { createOutputTab("Header", headerTemplate->errorString()); return; } @@ -138,45 +129,51 @@ NoEscapeOutputStream stream(&textStream); headerTemplate->render(&stream, &c); - createOutputTab("Header", headerTemplate->error() ? headerTemplate->errorString() : output); + createOutputTab("Header", headerTemplate->error() + ? headerTemplate->errorString() + : output); if (headerTemplate->error()) return; output.clear(); - Grantlee::Template implementationTemplate = m_engine->loadByName("implementation.cpp"); + Grantlee::Template implementationTemplate + = m_engine->loadByName("implementation.cpp"); - if (implementationTemplate->error()) - { + if (implementationTemplate->error()) { createOutputTab("Implementation", implementationTemplate->errorString()); return; } implementationTemplate->render(&stream, &c); - createOutputTab("Implementation", implementationTemplate->error() ? implementationTemplate->errorString() : output); + createOutputTab("Implementation", implementationTemplate->error() + ? implementationTemplate->errorString() + : output); if (implementationTemplate->error()) return; output.clear(); - if (c.lookup("pimpl").toBool()) - { - Grantlee::Template privateHeaderTemplate = m_engine->loadByName("private_header.h"); + if (c.lookup("pimpl").toBool()) { + Grantlee::Template privateHeaderTemplate + = m_engine->loadByName("private_header.h"); - if (privateHeaderTemplate->error()) - { + if (privateHeaderTemplate->error()) { createOutputTab("Private Header", privateHeaderTemplate->errorString()); return; } - c.insert( "className", Grantlee::getSafeString(c.lookup("className")) + QString("Private")); - c.insert( "baseClass", QVariant() ); + c.insert("className", Grantlee::getSafeString(c.lookup("className")) + + QString("Private")); + c.insert("baseClass", QVariant()); privateHeaderTemplate->render(&stream, &c); - createOutputTab("Private Header", privateHeaderTemplate->error() ? privateHeaderTemplate->errorString() : output); + createOutputTab("Private Header", privateHeaderTemplate->error() + ? privateHeaderTemplate->errorString() + : output); if (privateHeaderTemplate->error()) return; } } -void MainWindow::createOutputTab(const QString& label, const QString& content) +void MainWindow::createOutputTab(const QString &label, const QString &content) { QTextBrowser *browser = new QTextBrowser(m_tabWidget); QFont f; diff -Nru grantlee5-5.0.0/examples/codegen/mainwindow.h grantlee5-5.1.0/examples/codegen/mainwindow.h --- grantlee5-5.0.0/examples/codegen/mainwindow.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/mainwindow.h 2016-04-19 06:33:17.000000000 +0000 @@ -36,7 +36,7 @@ { Q_OBJECT public: - MainWindow(QWidget* parent = 0, Qt::WindowFlags flags = 0); + MainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); virtual ~MainWindow(); private Q_SLOTS: diff -Nru grantlee5-5.0.0/examples/codegen/methodmodel.cpp grantlee5-5.1.0/examples/codegen/methodmodel.cpp --- grantlee5-5.0.0/examples/codegen/methodmodel.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/methodmodel.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -20,27 +20,28 @@ #include "methodmodel.h" -MethodModel::MethodModel(QObject* parent) - : QStandardItemModel(parent) +MethodModel::MethodModel(QObject *parent) : QStandardItemModel(parent) { - setHorizontalHeaderLabels(QStringList() << "Access" << "virtual" << "Type" << "Name" << "Const"); + setHorizontalHeaderLabels(QStringList() << "Access" + << "virtual" + << "Type" + << "Name" + << "Const"); } -ArgsModel::ArgsModel(QObject* parent) - : QSortFilterProxyModel(parent) -{ - -} +ArgsModel::ArgsModel(QObject *parent) : QSortFilterProxyModel(parent) {} -QVariant ArgsModel::headerData(int section, Qt::Orientation orientation, int role) const +QVariant ArgsModel::headerData(int section, Qt::Orientation orientation, + int role) const { - if (role == Qt::DisplayRole && orientation == Qt::Horizontal) - { - switch(section) - { - case 0: return "Type"; - case 1: return "Name"; - case 2: return "Default"; + if (role == Qt::DisplayRole && orientation == Qt::Horizontal) { + switch (section) { + case 0: + return "Type"; + case 1: + return "Name"; + case 2: + return "Default"; } } return QSortFilterProxyModel::headerData(section, orientation, role); diff -Nru grantlee5-5.0.0/examples/codegen/methodmodel.h grantlee5-5.1.0/examples/codegen/methodmodel.h --- grantlee5-5.0.0/examples/codegen/methodmodel.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/methodmodel.h 2016-04-19 06:33:17.000000000 +0000 @@ -21,25 +21,24 @@ #ifndef METHOD_MODEL_H #define METHOD_MODEL_H -#include #include +#include class MethodModel : public QStandardItemModel { Q_OBJECT public: - MethodModel(QObject* parent = 0); - + MethodModel(QObject *parent = 0); }; class ArgsModel : public QSortFilterProxyModel { Q_OBJECT public: - ArgsModel(QObject* parent = 0); - - virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + ArgsModel(QObject *parent = 0); + virtual QVariant headerData(int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const; }; #endif diff -Nru grantlee5-5.0.0/examples/codegen/propertytablewidget.cpp grantlee5-5.1.0/examples/codegen/propertytablewidget.cpp --- grantlee5-5.0.0/examples/codegen/propertytablewidget.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/propertytablewidget.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -26,33 +26,31 @@ #include "comboboxdelegate.h" #include -PropertyTableWidget::PropertyTableWidget(QWidget* parent) - : QTableWidget(parent) +PropertyTableWidget::PropertyTableWidget(QWidget *parent) : QTableWidget(parent) { QStringList types; - for ( int i = 0; i < sizeof sTypes / sizeof *sTypes; ++i) + for (int i = 0; i < sizeof sTypes / sizeof *sTypes; ++i) types << *(sTypes + i); - setItemDelegateForColumn(0, new ComboBoxDelegate(types, ComboBoxDelegate::Editable)); + setItemDelegateForColumn( + 0, new ComboBoxDelegate(types, ComboBoxDelegate::Editable)); setEditTriggers(QAbstractItemView::AllEditTriggers); horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); - } -void PropertyTableWidget::contextMenuEvent(QContextMenuEvent* contextMenuEvent) +void PropertyTableWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent) { QMenu *popup = new QMenu(this); QAction *action; action = popup->addAction("Add"); - connect( action, SIGNAL(triggered(bool)), SLOT(slotAdd())); + connect(action, SIGNAL(triggered(bool)), SLOT(slotAdd())); action = popup->addAction("Clear All"); - connect( action, SIGNAL(triggered(bool)), SLOT(slotClear())); + connect(action, SIGNAL(triggered(bool)), SLOT(slotClear())); QModelIndex index = indexAt(contextMenuEvent->pos()); - if (index.isValid()) - { + if (index.isValid()) { action = popup->addAction("Remove"); - connect( action, SIGNAL(triggered(bool)), SLOT(slotRemove())); + connect(action, SIGNAL(triggered(bool)), SLOT(slotRemove())); } popup->exec(contextMenuEvent->globalPos()); } @@ -68,16 +66,12 @@ checkableItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); checkableItem->setCheckState(Qt::Unchecked); setItem(row, 2, checkableItem); - } -void PropertyTableWidget::slotRemove() -{ - removeRow(currentIndex().row()); -} +void PropertyTableWidget::slotRemove() { removeRow(currentIndex().row()); } void PropertyTableWidget::slotClear() { - for (int row = rowCount() - 1; row >= 0; --row ) + for (int row = rowCount() - 1; row >= 0; --row) removeRow(row); } diff -Nru grantlee5-5.0.0/examples/codegen/propertytablewidget.h grantlee5-5.1.0/examples/codegen/propertytablewidget.h --- grantlee5-5.0.0/examples/codegen/propertytablewidget.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/codegen/propertytablewidget.h 2016-04-19 06:33:17.000000000 +0000 @@ -27,15 +27,14 @@ { Q_OBJECT public: - PropertyTableWidget(QWidget* parent = 0); + PropertyTableWidget(QWidget *parent = 0); - virtual void contextMenuEvent(QContextMenuEvent *contextMenuEvent ); + virtual void contextMenuEvent(QContextMenuEvent *contextMenuEvent); public Q_SLOTS: void slotAdd(); void slotRemove(); void slotClear(); - }; #endif diff -Nru grantlee5-5.0.0/examples/contacts/CMakeLists.txt grantlee5-5.1.0/examples/contacts/CMakeLists.txt --- grantlee5-5.0.0/examples/contacts/CMakeLists.txt 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/contacts/CMakeLists.txt 2016-04-19 06:33:17.000000000 +0000 @@ -34,7 +34,7 @@ "${CMAKE_SOURCE_DIR}/themes/linguist/bashful/*.html" "${CMAKE_SOURCE_DIR}/themes/linguist/sneezy/*.html" "${CMAKE_SOURCE_DIR}/themes/linguist/sleepy/*.html" - "> ${CMAKE_BINARY_DIR}/output.cpp" + ">" "${CMAKE_BINARY_DIR}/output.cpp" COMMAND Qt5::lupdate "${CMAKE_BINARY_DIR}/output.cpp" "-ts" ) set (CONTACTS_LOCALES "fr_FR" "de_DE" ) diff -Nru grantlee5-5.0.0/examples/contacts/contact.cpp grantlee5-5.1.0/examples/contacts/contact.cpp --- grantlee5-5.0.0/examples/contacts/contact.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/contacts/contact.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -20,137 +20,63 @@ #include "contact.h" -Address::Address(QObject* parent) - : QObject(parent) -{ +Address::Address(QObject *parent) : QObject(parent) {} -} +int Address::houseNumber() const { return m_houseNumber; } -int Address::houseNumber() const -{ - return m_houseNumber; -} - -QString Address::city() -{ - return m_city; -} +QString Address::city() { return m_city; } -QString Address::streetName() -{ - return m_streetName; -} +QString Address::streetName() { return m_streetName; } -void Address::setCity(const QString& city) -{ - m_city = city; -} +void Address::setCity(const QString &city) { m_city = city; } -void Address::setHouseNumber(int houseNumber) -{ - m_houseNumber = houseNumber; -} +void Address::setHouseNumber(int houseNumber) { m_houseNumber = houseNumber; } -void Address::setStreetName(const QString& streetName) +void Address::setStreetName(const QString &streetName) { m_streetName = streetName; } +Contact::Contact(QObject *parent) : QObject(parent), m_address(0) {} -Contact::Contact(QObject* parent) - : QObject(parent), m_address(0) -{ -} +QString Contact::name() const { return m_name; } -QString Contact::name() const -{ - return m_name; -} +void Contact::setName(const QString &name) { m_name = name; } -void Contact::setName(const QString& name) -{ - m_name = name; -} +QString Contact::email() const { return m_email; } -QString Contact::email() const -{ - return m_email; -} +void Contact::setEmail(const QString &email) { m_email = email; } -void Contact::setEmail(const QString& email) -{ - m_email = email; -} +QString Contact::phone() const { return m_phone; } -QString Contact::phone() const -{ - return m_phone; -} +void Contact::setPhone(const QString &phone) { m_phone = phone; } -void Contact::setPhone(const QString& phone) -{ - m_phone = phone; -} +QObject *Contact::address() const { return m_address; } -QObject* Contact::address() const -{ - return m_address; -} +void Contact::setAddress(Address *address) { m_address = address; } -void Contact::setAddress(Address *address) -{ - m_address = address; -} +QString Contact::nickname() const { return m_nickname; } -QString Contact::nickname() const -{ - return m_nickname; -} +void Contact::setNickname(const QString &nickname) { m_nickname = nickname; } -void Contact::setNickname(const QString& nickname) -{ - m_nickname = nickname; -} - -QString Contact::salaryCurrency() const -{ - return m_salaryCurrency; -} +QString Contact::salaryCurrency() const { return m_salaryCurrency; } -void Contact::setSalaryCurrency(const QString& salaryCurrency) +void Contact::setSalaryCurrency(const QString &salaryCurrency) { m_salaryCurrency = salaryCurrency; } -double Contact::salary() const -{ - return m_salary; -} +double Contact::salary() const { return m_salary; } -void Contact::setSalary(double salary) -{ - m_salary = salary; -} +void Contact::setSalary(double salary) { m_salary = salary; } -double Contact::rating() const -{ - return m_rating; -} +double Contact::rating() const { return m_rating; } -void Contact::setRating(double rating) -{ - m_rating = rating; -} +void Contact::setRating(double rating) { m_rating = rating; } -QDate Contact::birthday() const -{ - return m_birthday; -} +QDate Contact::birthday() const { return m_birthday; } -void Contact::setBirthday(const QDate &birthday) -{ - m_birthday = birthday; -} +void Contact::setBirthday(const QDate &birthday) { m_birthday = birthday; } QVariant Contact::data(int role) const { @@ -159,12 +85,9 @@ return m_name; } -QVariant Contact::friends() const -{ - return QVariant::fromValue(m_friends); -} +QVariant Contact::friends() const { return QVariant::fromValue(m_friends); } -void Contact::setFriends(const QList &friends) +void Contact::setFriends(const QList &friends) { m_friends = friends; } diff -Nru grantlee5-5.0.0/examples/contacts/contact.h grantlee5-5.1.0/examples/contacts/contact.h --- grantlee5-5.0.0/examples/contacts/contact.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/contacts/contact.h 2016-04-19 06:33:17.000000000 +0000 @@ -21,9 +21,9 @@ #ifndef CONTACT_H #define CONTACT_H -#include -#include #include +#include +#include class Address : public QObject { @@ -55,16 +55,16 @@ Q_PROPERTY(QString name READ name) Q_PROPERTY(QString email READ email) Q_PROPERTY(QString phone READ phone) - Q_PROPERTY(QObject* address READ address) + Q_PROPERTY(QObject *address READ address) Q_PROPERTY(QString nickname READ nickname) - Q_PROPERTY(double salary READ salary) + Q_PROPERTY(double salary READ salary) Q_PROPERTY(QString salaryCurrency READ salaryCurrency) - Q_PROPERTY(double rating READ rating) - Q_PROPERTY(QDate birthday READ birthday) + Q_PROPERTY(double rating READ rating) + Q_PROPERTY(QDate birthday READ birthday) Q_PROPERTY(QVariant friends READ friends) public: - Contact(QObject* parent = 0); + Contact(QObject *parent = 0); QString name() const; void setName(const QString &name); @@ -75,14 +75,14 @@ QString phone() const; void setPhone(const QString &phone); - QObject* address() const; + QObject *address() const; void setAddress(Address *address); QString nickname() const; - void setNickname(const QString& nickname); + void setNickname(const QString &nickname); QString salaryCurrency() const; - void setSalaryCurrency(const QString& salaryCurrency); + void setSalaryCurrency(const QString &salaryCurrency); double salary() const; void setSalary(double salary); @@ -94,7 +94,7 @@ void setBirthday(const QDate &birthday); QVariant friends() const; - void setFriends(const QList &friends); + void setFriends(const QList &friends); /* reimp */ QVariant data(int role) const; @@ -108,11 +108,11 @@ double m_salary; double m_rating; QDate m_birthday; - QList m_friends; + QList m_friends; }; -Q_DECLARE_METATYPE(Contact*) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(Contact *) +Q_DECLARE_METATYPE(QList) +Q_DECLARE_METATYPE(QList) #endif diff -Nru grantlee5-5.0.0/examples/contacts/de_DE.ts grantlee5-5.1.0/examples/contacts/de_DE.ts --- grantlee5-5.0.0/examples/contacts/de_DE.ts 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/contacts/de_DE.ts 2016-04-19 06:33:17.000000000 +0000 @@ -1,6 +1,6 @@ - + GR_FILENAME @@ -20,7 +20,7 @@ Nickname - + Spitzname @@ -29,8 +29,9 @@ %n person The total number of people displayed - - + + %n Person + %n Personen @@ -43,7 +44,7 @@ Name The name of a person - + Name @@ -62,7 +63,7 @@ Email - + mail @@ -81,7 +82,7 @@ Phone - + Handy @@ -100,7 +101,7 @@ Address - + Addresse @@ -117,7 +118,7 @@ Birthday - + Geburtstag @@ -125,7 +126,7 @@ Salary - + Gehalt @@ -133,7 +134,7 @@ Rating - + Wert @@ -142,15 +143,16 @@ %n person - - + + %n Person + %n Personen Name - + Name diff -Nru grantlee5-5.0.0/examples/contacts/kdelocalizer.cpp grantlee5-5.1.0/examples/contacts/kdelocalizer.cpp --- grantlee5-5.0.0/examples/contacts/kdelocalizer.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/contacts/kdelocalizer.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -32,35 +32,30 @@ class KDELocalizerPrivate { KDELocalizerPrivate(KDELocalizer *qq, KLocale *locale) - : q_ptr(qq), m_locale(locale ? locale : KGlobal::locale() ) + : q_ptr(qq), m_locale(locale ? locale : KGlobal::locale()) { - } Q_DECLARE_PUBLIC(KDELocalizer) - KDELocalizer * const q_ptr; + KDELocalizer *const q_ptr; QStringList m_applicationCatalogs; QStringList m_catalogs; - QStack m_localeStack; + QStack m_localeStack; KLocale *m_locale; }; -KDELocalizer::KDELocalizer(KLocale* locale) - : d_ptr(new KDELocalizerPrivate(this, locale)) +KDELocalizer::KDELocalizer(KLocale *locale) + : d_ptr(new KDELocalizerPrivate(this, locale)) { - } -KDELocalizer::~KDELocalizer() -{ - delete d_ptr; -} +KDELocalizer::~KDELocalizer() { delete d_ptr; } -void KDELocalizer::insertApplicationCatalogs(const QStringList& catalogs) +void KDELocalizer::insertApplicationCatalogs(const QStringList &catalogs) { Q_D(KDELocalizer); d->m_applicationCatalogs = catalogs; - Q_FOREACH(const QString &catalog, d->m_applicationCatalogs) { + Q_FOREACH (const QString &catalog, d->m_applicationCatalogs) { d->m_locale->insertCatalog(catalog); } } @@ -71,7 +66,7 @@ return d->m_locale->language(); } -void KDELocalizer::pushLocale(const QString& localeName) +void KDELocalizer::pushLocale(const QString &localeName) { Q_D(KDELocalizer); d->m_localeStack.push(d->m_locale); @@ -79,11 +74,12 @@ QString country; if (parts.size() == 2) country = parts.at(1).toLower(); - d->m_locale = new KLocale(KGlobal::mainComponent().catalogName(), localeName, country); - Q_FOREACH(const QString &catalog, d->m_applicationCatalogs) { + d->m_locale = new KLocale(KGlobal::mainComponent().catalogName(), localeName, + country); + Q_FOREACH (const QString &catalog, d->m_applicationCatalogs) { d->m_locale->insertCatalog(catalog); } - Q_FOREACH(const QString &catalog, d->m_catalogs) { + Q_FOREACH (const QString &catalog, d->m_catalogs) { d->m_locale->insertCatalog(catalog); } } @@ -97,7 +93,7 @@ d->m_localeStack.pop(); } -void KDELocalizer::loadCatalog(const QString &path, const QString& catalog) +void KDELocalizer::loadCatalog(const QString &path, const QString &catalog) { Q_D(KDELocalizer); KGlobal::dirs()->addResourceDir("locale", path, true); @@ -106,16 +102,17 @@ d->m_locale->insertCatalog(catalog); } -void KDELocalizer::unloadCatalog(const QString& catalog) +void KDELocalizer::unloadCatalog(const QString &catalog) { Q_D(KDELocalizer); -// Does not exist (probably not necessary either): + // Does not exist (probably not necessary either): // KGlobal::dirs()->removeResourceDir("locale", path + '/' + catalog, true); d->m_catalogs.removeAll(catalog); d->m_locale->removeCatalog(catalog); } -QString KDELocalizer::localizeDate(const QDate& date, QLocale::FormatType formatType) const +QString KDELocalizer::localizeDate(const QDate &date, + QLocale::FormatType formatType) const { Q_D(const KDELocalizer); KLocale::DateFormat klocaleFormat = KLocale::ShortDate; @@ -125,7 +122,8 @@ return d->m_locale->formatDate(date, klocaleFormat); } -QString KDELocalizer::localizeTime(const QTime& time, QLocale::FormatType formatType) const +QString KDELocalizer::localizeTime(const QTime &time, + QLocale::FormatType formatType) const { Q_D(const KDELocalizer); KLocale::TimeFormatOptions klocaleFormat = KLocale::TimeDefault; @@ -135,7 +133,8 @@ return d->m_locale->formatLocaleTime(time, klocaleFormat); } -QString KDELocalizer::localizeDateTime(const QDateTime& dateTime, QLocale::FormatType formatType) const +QString KDELocalizer::localizeDateTime(const QDateTime &dateTime, + QLocale::FormatType formatType) const { Q_D(const KDELocalizer); KLocale::DateFormat klocaleFormat = KLocale::ShortDate; @@ -145,7 +144,8 @@ return d->m_locale->formatDateTime(dateTime, klocaleFormat); } -QString KDELocalizer::localizeMonetaryValue(qreal value, const QString& currencyCode) const +QString KDELocalizer::localizeMonetaryValue(qreal value, + const QString ¤cyCode) const { Q_D(const KDELocalizer); KCurrencyCode code(currencyCode); @@ -164,42 +164,52 @@ return d->m_locale->formatNumber(number); } -static KLocalizedString substituteArguments(const KLocalizedString &_string, const QVariantList &args) +static KLocalizedString substituteArguments(const KLocalizedString &_string, + const QVariantList &args) { KLocalizedString string = _string; - Q_FOREACH(const QVariant &arg, args) { + Q_FOREACH (const QVariant &arg, args) { if (arg.type() == QVariant::Int) string = string.subs(arg.toInt()); else if (arg.type() == QVariant::Double) string = string.subs(arg.toDouble()); else - string = string.subs(arg.toString()); + string = string.subs(arg.toString()); } return string; } -QString KDELocalizer::localizeContextString(const QString& string, const QString& context, const QVariantList &arguments ) const +QString KDELocalizer::localizeContextString(const QString &string, + const QString &context, + const QVariantList &arguments) const { Q_D(const KDELocalizer); KLocalizedString localizedString = ki18nc(context.toUtf8(), string.toUtf8()); return substituteArguments(localizedString, arguments).toString(d->m_locale); } -QString KDELocalizer::localizePluralContextString(const QString& string, const QString& pluralForm, const QString& context, const QVariantList &arguments ) const +QString KDELocalizer::localizePluralContextString( + const QString &string, const QString &pluralForm, const QString &context, + const QVariantList &arguments) const { Q_D(const KDELocalizer); - KLocalizedString localizedString = ki18ncp(context.toUtf8(), string.toUtf8(), pluralForm.toUtf8()); + KLocalizedString localizedString + = ki18ncp(context.toUtf8(), string.toUtf8(), pluralForm.toUtf8()); return substituteArguments(localizedString, arguments).toString(d->m_locale); } -QString KDELocalizer::localizePluralString(const QString& string, const QString& pluralForm, const QVariantList &arguments ) const +QString KDELocalizer::localizePluralString(const QString &string, + const QString &pluralForm, + const QVariantList &arguments) const { Q_D(const KDELocalizer); - KLocalizedString localizedString = ki18np(string.toUtf8(), pluralForm.toUtf8()); + KLocalizedString localizedString + = ki18np(string.toUtf8(), pluralForm.toUtf8()); return substituteArguments(localizedString, arguments).toString(d->m_locale); } -QString KDELocalizer::localizeString(const QString& string, const QVariantList &arguments ) const +QString KDELocalizer::localizeString(const QString &string, + const QVariantList &arguments) const { Q_D(const KDELocalizer); KLocalizedString localizedString = ki18n(string.toUtf8()); diff -Nru grantlee5-5.0.0/examples/contacts/kdelocalizer.h grantlee5-5.1.0/examples/contacts/kdelocalizer.h --- grantlee5-5.0.0/examples/contacts/kdelocalizer.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/contacts/kdelocalizer.h 2016-04-19 06:33:17.000000000 +0000 @@ -32,7 +32,7 @@ class KDELocalizer : public Grantlee::AbstractLocalizer { public: - KDELocalizer( KLocale *locale = 0 ); + KDELocalizer(KLocale *locale = 0); virtual ~KDELocalizer(); // Right to left? @@ -47,18 +47,33 @@ virtual QString localizeNumber(int number) const; virtual QString localizeNumber(qreal number) const; - virtual QString localizeMonetaryValue( qreal value, const QString ¤cyCode = QString() ) const; - virtual QString localizeDate(const QDate& date, QLocale::FormatType formatType = QLocale::ShortFormat) const; - virtual QString localizeTime(const QTime& time, QLocale::FormatType formatType = QLocale::ShortFormat) const; - virtual QString localizeDateTime(const QDateTime& dateTime, QLocale::FormatType formatType = QLocale::ShortFormat) const; - virtual QString localizeString(const QString& string, const QVariantList &arguments = QVariantList() ) const; - virtual QString localizeContextString(const QString& string, const QString& context, const QVariantList &arguments = QVariantList() ) const; - virtual QString localizePluralContextString(const QString& string, const QString& pluralForm, const QString& context, const QVariantList &arguments = QVariantList() ) const; - virtual QString localizePluralString(const QString& string, const QString& pluralForm, const QVariantList &arguments = QVariantList() ) const; + virtual QString localizeMonetaryValue(qreal value, const QString ¤cyCode + = QString()) const; + virtual QString localizeDate(const QDate &date, QLocale::FormatType formatType + = QLocale::ShortFormat) const; + virtual QString localizeTime(const QTime &time, QLocale::FormatType formatType + = QLocale::ShortFormat) const; + virtual QString localizeDateTime(const QDateTime &dateTime, + QLocale::FormatType formatType + = QLocale::ShortFormat) const; + virtual QString localizeString(const QString &string, + const QVariantList &arguments + = QVariantList()) const; + virtual QString + localizeContextString(const QString &string, const QString &context, + const QVariantList &arguments = QVariantList()) const; + virtual QString localizePluralContextString(const QString &string, + const QString &pluralForm, + const QString &context, + const QVariantList &arguments + = QVariantList()) const; + virtual QString + localizePluralString(const QString &string, const QString &pluralForm, + const QVariantList &arguments = QVariantList()) const; private: Q_DECLARE_PRIVATE(KDELocalizer) - KDELocalizerPrivate * const d_ptr; + KDELocalizerPrivate *const d_ptr; }; #endif \ No newline at end of file diff -Nru grantlee5-5.0.0/examples/contacts/main_kde.cpp grantlee5-5.1.0/examples/contacts/main_kde.cpp --- grantlee5-5.0.0/examples/contacts/main_kde.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/contacts/main_kde.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -22,20 +22,20 @@ #include "kdelocalizer.h" -#include #include +#include #include #include "grantlee_paths.h" #define TEMPLATE_DIR GRANTLEE_TEMPLATE_PATH "/gettext/" -int main( int argc, char **argv ) +int main(int argc, char **argv) { - const QByteArray& ba = QByteArray( "contacts_kde" ); - const KLocalizedString name = ki18n( "Grantlee KDE i18n example" ); - KAboutData aboutData( ba, ba, name, ba, name ); - KCmdLineArgs::init( argc, argv, &aboutData ); + const QByteArray &ba = QByteArray("contacts_kde"); + const KLocalizedString name = ki18n("Grantlee KDE i18n example"); + KAboutData aboutData(ba, ba, name, ba, name); + KCmdLineArgs::init(argc, argv, &aboutData); KApplication app; diff -Nru grantlee5-5.0.0/examples/contacts/main_linguist.cpp grantlee5-5.1.0/examples/contacts/main_linguist.cpp --- grantlee5-5.0.0/examples/contacts/main_linguist.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/contacts/main_linguist.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -21,8 +21,8 @@ #include "mainwindow.h" #include -#include #include +#include #include @@ -32,22 +32,27 @@ static QSharedPointer getLocalizer() { - QSharedPointer localizer = QSharedPointer( new Grantlee::QtLocalizer ); + QSharedPointer localizer + = QSharedPointer(new Grantlee::QtLocalizer); localizer->setAppTranslatorPrefix("contacts_"); localizer->setAppTranslatorPath(qApp->applicationDirPath()); - QStringList locales = QStringList() << "en_US" << "en_GB" << "de_DE" << "fr_FR"; + QStringList locales = QStringList() << "en_US" + << "en_GB" + << "de_DE" + << "fr_FR"; if (!locales.contains(QLocale::system().name())) locales.append(QLocale::system().name()); - Q_FOREACH(const QString &localeName, locales) { + Q_FOREACH (const QString &localeName, locales) { QTranslator *qtTranslator = new QTranslator; qtTranslator->load("qt_" + localeName, - QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + QLibraryInfo::location(QLibraryInfo::TranslationsPath)); qtTranslator->setObjectName("qt_" + localeName); localizer->installTranslator(qtTranslator, localeName); QTranslator *myappTranslator = new QTranslator; - myappTranslator->load("contacts_" + localeName + ".qm", qApp->applicationDirPath()); + myappTranslator->load("contacts_" + localeName + ".qm", + qApp->applicationDirPath()); myappTranslator->setObjectName("contacts_" + localeName); localizer->installTranslator(myappTranslator, localeName); } @@ -55,18 +60,17 @@ return localizer.staticCast(); } -template<> -void AppMainWindow::initLocalizer() +template <> void AppMainWindow::initLocalizer() { m_localizer = getLocalizer(); } -int main(int argc, char * argv[]) +int main(int argc, char *argv[]) { - QApplication app(argc, argv); + QApplication app(argc, argv); - AppMainWindow win(TEMPLATE_DIR); - win.show(); + AppMainWindow win(TEMPLATE_DIR); + win.show(); - return app.exec(); + return app.exec(); } diff -Nru grantlee5-5.0.0/examples/contacts/mainwindow.cpp grantlee5-5.1.0/examples/contacts/mainwindow.cpp --- grantlee5-5.0.0/examples/contacts/mainwindow.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/contacts/mainwindow.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -19,10 +19,10 @@ */ #include "mainwindow.h" -#include -#include #include #include +#include +#include #include "contact.h" #include @@ -44,19 +44,25 @@ double salary; double rating; int daysOld; -} contacts[] = -{ - { "Alice Murphy", "alice@wonderland.com", "+12345", 123, "Fake St", "New York", "dreamer", "EUR", 45000.45, 234.4, 7500 }, - { "Bob Murphy", "bob@murphy.com", "+34567", 456, "Fake St", "Paris", "bobby", "EUR", 560000.56, 2340.4, 8500 }, - { "Carly Carlson", "carly@carlson.com", "+56789", 123, "No St", "London", "carlie", "USD", 67000.67, 23400.4, 8000 }, - { "David Doyle", "david@doyle.com", "+77894", 456, "No St", "Berlin", "doyler", "USD", 78000.78, 234000.4, 7575 }, - { "Emma Stevenson", "emma@stevenson.com", "+65432", 89, "Fake St", "Syndey", "emms", "EUR", 5400000.54, 2340000.4, 8080 }, - { "Frank Fischer", "frank@fischer.com", "+54321", 321, "Fake St", "Tokyo", "fish", "EUR", 89000.89, 234000.4, 8754 }, - { "Gina Jameson", "gina@jameson.com", "+98765", 123, "Other St", "Beijing", "genes", "EUR", 430000, 23400000.4, 9000 } -}; - -MainWindow::MainWindow(const QString &templateDir, QWidget *parent, Qt::WindowFlags flags) - : QWidget(parent, flags) +} contacts[] + = {{"Alice Murphy", "alice@wonderland.com", "+12345", 123, "Fake St", + "New York", "dreamer", "EUR", 45000.45, 234.4, 7500}, + {"Bob Murphy", "bob@murphy.com", "+34567", 456, "Fake St", "Paris", + "bobby", "EUR", 560000.56, 2340.4, 8500}, + {"Carly Carlson", "carly@carlson.com", "+56789", 123, "No St", "London", + "carlie", "USD", 67000.67, 23400.4, 8000}, + {"David Doyle", "david@doyle.com", "+77894", 456, "No St", "Berlin", + "doyler", "USD", 78000.78, 234000.4, 7575}, + {"Emma Stevenson", "emma@stevenson.com", "+65432", 89, "Fake St", + "Syndey", "emms", "EUR", 5400000.54, 2340000.4, 8080}, + {"Frank Fischer", "frank@fischer.com", "+54321", 321, "Fake St", "Tokyo", + "fish", "EUR", 89000.89, 234000.4, 8754}, + {"Gina Jameson", "gina@jameson.com", "+98765", 123, "Other St", + "Beijing", "genes", "EUR", 430000, 23400000.4, 9000}}; + +MainWindow::MainWindow(const QString &templateDir, QWidget *parent, + Qt::WindowFlags flags) + : QWidget(parent, flags) { QHBoxLayout *layout = new QHBoxLayout(this); QSplitter *splitter = new QSplitter(this); @@ -67,11 +73,8 @@ const int numContacts = sizeof(contacts) / sizeof(*contacts); - Grantlee::registerSequentialContainer >(); - QList contactList; - for (int i = 0; i < numContacts; ++i) - { + for (int i = 0; i < numContacts; ++i) { Contact *c = new Contact(this); c->setName(contacts[i].name); c->setEmail(contacts[i].email); @@ -89,20 +92,22 @@ contactList.append(c); } - for (int i = 0; i < numContacts; ++i) - { + for (int i = 0; i < numContacts; ++i) { Contact *friend1 = contactList[(i + 1) % numContacts]; Contact *friend2 = contactList[(i + 2) % numContacts]; Contact *friend3 = contactList[(i + 3) % numContacts]; - QList friends = QList() << friend1 << friend2 << friend3; + QList friends = QList() << friend1 << friend2 + << friend3; contactList[i]->setFriends(friends); } - Q_FOREACH(Contact *contact, contactList) { + Q_FOREACH (Contact *contact, contactList) { m_list->addItem(contact); } - connect(m_list->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), SLOT(render()) ); + connect(m_list->selectionModel(), + SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + SLOT(render())); QWidget *widget = new QWidget(splitter); QVBoxLayout *wLayout = new QVBoxLayout(); @@ -113,7 +118,8 @@ m_templateDir = templateDir; QDir themeDir(templateDir); - m_combo->insertItems(0, themeDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)); + m_combo->insertItems(0, + themeDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)); connect(m_combo, SIGNAL(currentIndexChanged(int)), SLOT(render())); @@ -125,35 +131,33 @@ void MainWindow::delayedInit() { m_engine = new Grantlee::Engine(this); - m_engine->addDefaultLibrary( "grantlee_i18n" ); - m_engine->addDefaultLibrary( "grantlee_scriptabletags" ); + m_engine->addDefaultLibrary("grantlee_i18n"); + m_engine->addDefaultLibrary("grantlee_scriptabletags"); initLocalizer(); - m_templateLoader = QSharedPointer(new Grantlee::FileSystemTemplateLoader(m_localizer)); + m_templateLoader = QSharedPointer( + new Grantlee::FileSystemTemplateLoader(m_localizer)); m_templateLoader->setTemplateDirs(QStringList() << m_templateDir); m_engine->addTemplateLoader(m_templateLoader); } -void MainWindow::initLocalizer() -{ - -} +void MainWindow::initLocalizer() {} void MainWindow::render() const { - const QList list = m_list->selectedItems(); + const QList list = m_list->selectedItems(); QVariantList contacts; - Q_FOREACH(QListWidgetItem *item, list) - contacts << QVariant::fromValue(static_cast(static_cast(item))); + Q_FOREACH (QListWidgetItem *item, list) + contacts << QVariant::fromValue( + static_cast(static_cast(item))); m_templateLoader->setTheme(m_combo->currentText()); Grantlee::Template t = m_engine->loadByName("main.html"); - if (t->error()) - { + if (t->error()) { qDebug() << t->errorString(); return; } @@ -164,8 +168,7 @@ const QString result = t->render(&c); - if (t->error()) - { + if (t->error()) { qDebug() << t->errorString(); return; } diff -Nru grantlee5-5.0.0/examples/contacts/mainwindow.h grantlee5-5.1.0/examples/contacts/mainwindow.h --- grantlee5-5.0.0/examples/contacts/mainwindow.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/contacts/mainwindow.h 2016-04-19 06:33:17.000000000 +0000 @@ -27,7 +27,8 @@ #include #include -namespace Grantlee { +namespace Grantlee +{ class Engine; } @@ -37,7 +38,8 @@ { Q_OBJECT public: - MainWindow(const QString &templateDir, QWidget* parent = 0, Qt::WindowFlags f = 0); + MainWindow(const QString &templateDir, QWidget *parent = 0, + Qt::WindowFlags f = 0); protected: virtual void initLocalizer(); @@ -56,24 +58,23 @@ QString m_templateDir; Grantlee::Engine *m_engine; - QSharedPointer m_templateLoader; + QSharedPointer m_templateLoader; }; -template -class AppMainWindow : public MainWindow +template class AppMainWindow : public MainWindow { public: - AppMainWindow(const QString& templateDir, QWidget* parent = 0, Qt::WindowFlags f = 0) - : MainWindow(templateDir, parent, f) + AppMainWindow(const QString &templateDir, QWidget *parent = 0, + Qt::WindowFlags f = 0) + : MainWindow(templateDir, parent, f) { - } + protected: virtual void initLocalizer() { - m_localizer = QSharedPointer( new T ); + m_localizer = QSharedPointer(new T); } }; - #endif diff -Nru grantlee5-5.0.0/examples/htmlapps/CMakeLists.txt grantlee5-5.1.0/examples/htmlapps/CMakeLists.txt --- grantlee5-5.0.0/examples/htmlapps/CMakeLists.txt 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/CMakeLists.txt 2016-04-19 06:33:17.000000000 +0000 @@ -39,6 +39,6 @@ find_package(Qt5WebKitWidgets REQUIRED) target_link_libraries(htmlapps - Grantlee::Templates + Grantlee5::Templates Qt5::WebKitWidgets ) diff -Nru grantlee5-5.0.0/examples/htmlapps/customplugin.cpp grantlee5-5.1.0/examples/htmlapps/customplugin.cpp --- grantlee5-5.0.0/examples/htmlapps/customplugin.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/customplugin.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -18,11 +18,10 @@ */ - #include "customplugin.h" #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #include -Q_EXPORT_PLUGIN2( customplugin, CustomPlugin ) +Q_EXPORT_PLUGIN2(customplugin, CustomPlugin) #endif diff -Nru grantlee5-5.0.0/examples/htmlapps/customplugin.h grantlee5-5.1.0/examples/htmlapps/customplugin.h --- grantlee5-5.0.0/examples/htmlapps/customplugin.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/customplugin.h 2016-04-19 06:33:17.000000000 +0000 @@ -18,7 +18,6 @@ */ - #ifndef CUSTOM_TAGS_H #define CUSTOM_TAGS_H @@ -31,26 +30,26 @@ class CustomPlugin : public QObject, public TagLibraryInterface { Q_OBJECT - Q_INTERFACES( Grantlee::TagLibraryInterface ) + Q_INTERFACES(Grantlee::TagLibraryInterface) Q_PLUGIN_METADATA(IID "org.grantlee.TagLibraryInterface") public: - CustomPlugin( QObject *parent = 0 ) - : QObject( parent ) { - } + CustomPlugin(QObject *parent = 0) : QObject(parent) {} - virtual QHash< QString, AbstractNodeFactory* > nodeFactories(const QString& name = QString()) { - Q_UNUSED( name ); - QHash< QString, AbstractNodeFactory* > facts; - facts.insert( "rssfeed", new RssFeedNodeFactory() ); - facts.insert( "xmlrole", new XmlRoleNodeFactory() ); - facts.insert( "xmlns", new XmlNamespaceNodeFactory() ); + virtual QHash + nodeFactories(const QString &name = QString()) + { + Q_UNUSED(name); + QHash facts; + facts.insert("rssfeed", new RssFeedNodeFactory()); + facts.insert("xmlrole", new XmlRoleNodeFactory()); + facts.insert("xmlns", new XmlNamespaceNodeFactory()); return facts; } - virtual QHash< QString, Filter* > filters(const QString& name = QString()) + virtual QHash filters(const QString &name = QString()) { - Q_UNUSED( name ); - QHash< QString, Filter* > _filters; + Q_UNUSED(name); + QHash _filters; _filters.insert("resize", new ResizeFilter); return _filters; } diff -Nru grantlee5-5.0.0/examples/htmlapps/localrequestmanager.cpp grantlee5-5.1.0/examples/htmlapps/localrequestmanager.cpp --- grantlee5-5.0.0/examples/htmlapps/localrequestmanager.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/localrequestmanager.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -8,13 +8,16 @@ #include "templatereply.h" -LocalRequestManager::LocalRequestManager(Grantlee::Engine *engine, QObject* parent) - : QNetworkAccessManager(parent), m_engine( engine ) +LocalRequestManager::LocalRequestManager(Grantlee::Engine *engine, + QObject *parent) + : QNetworkAccessManager(parent), m_engine(engine) { - } -QNetworkReply* LocalRequestManager::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest& request, QIODevice* outgoingData) +QNetworkReply * +LocalRequestManager::createRequest(QNetworkAccessManager::Operation op, + const QNetworkRequest &request, + QIODevice *outgoingData) { QUrl requestUrl = request.url(); if (requestUrl.scheme() != "template") { @@ -27,7 +30,7 @@ qDebug() << t->errorString(); } - QList > query = requestUrl.queryItems(); + QList> query = requestUrl.queryItems(); if (outgoingData) { QUrl postData; postData.setEncodedQuery(outgoingData->readAll()); diff -Nru grantlee5-5.0.0/examples/htmlapps/localrequestmanager.h grantlee5-5.1.0/examples/htmlapps/localrequestmanager.h --- grantlee5-5.0.0/examples/htmlapps/localrequestmanager.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/localrequestmanager.h 2016-04-19 06:33:17.000000000 +0000 @@ -12,7 +12,10 @@ public: LocalRequestManager(Grantlee::Engine *engine, QObject *parent = 0); - virtual QNetworkReply* createRequest(Operation op, const QNetworkRequest& request, QIODevice* outgoingData = 0); + virtual QNetworkReply *createRequest(Operation op, + const QNetworkRequest &request, + QIODevice *outgoingData = 0); + private: Grantlee::Engine *m_engine; }; diff -Nru grantlee5-5.0.0/examples/htmlapps/mainwindow.cpp grantlee5-5.1.0/examples/htmlapps/mainwindow.cpp --- grantlee5-5.0.0/examples/htmlapps/mainwindow.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/mainwindow.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -1,27 +1,27 @@ #include "mainwindow.h" -#include #include #include +#include -#include #include "grantlee_paths.h" +#include #include "localrequestmanager.h" #include -MainWindow::MainWindow(QWidget* parent) - : QWidget(parent) +MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { QHBoxLayout *layout = new QHBoxLayout(this); QWebView *wv = new QWebView; Grantlee::Engine *engine = new Grantlee::Engine(this); - engine->addDefaultLibrary( "customplugin" ); + engine->addDefaultLibrary("customplugin"); - QSharedPointer loader(new Grantlee::FileSystemTemplateLoader); + QSharedPointer loader( + new Grantlee::FileSystemTemplateLoader); loader->setTemplateDirs(QStringList() << GRANTLEE_TEMPLATE_PATH); engine->addTemplateLoader(loader); diff -Nru grantlee5-5.0.0/examples/htmlapps/mainwindow.h grantlee5-5.1.0/examples/htmlapps/mainwindow.h --- grantlee5-5.0.0/examples/htmlapps/mainwindow.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/mainwindow.h 2016-04-19 06:33:17.000000000 +0000 @@ -9,7 +9,6 @@ Q_OBJECT public: MainWindow(QWidget *parent = 0); - }; #endif diff -Nru grantlee5-5.0.0/examples/htmlapps/rssfeed.cpp grantlee5-5.1.0/examples/htmlapps/rssfeed.cpp --- grantlee5-5.0.0/examples/htmlapps/rssfeed.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/rssfeed.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -22,28 +22,27 @@ #include - +#include +#include +#include +#include #include -#include #include #include +#include #include -#include #include -#include -#include -#include -#include +#include Q_DECLARE_METATYPE(QXmlQuery) -RssFeedNodeFactory::RssFeedNodeFactory(QObject* parent) - : Grantlee::AbstractNodeFactory(parent) +RssFeedNodeFactory::RssFeedNodeFactory(QObject *parent) + : Grantlee::AbstractNodeFactory(parent) { - } -Grantlee::Node* RssFeedNodeFactory::getNode(const QString& tagContent, Grantlee::Parser* p) const +Grantlee::Node *RssFeedNodeFactory::getNode(const QString &tagContent, + Grantlee::Parser *p) const { QStringList expr = smartSplit(tagContent); Grantlee::FilterExpression url(expr.at(1), p); @@ -51,7 +50,7 @@ RssFeedNode *n = new RssFeedNode(url, query); - QList nodes = p->parse(n, "endrssfeed"); + QList nodes = p->parse(n, "endrssfeed"); p->takeNextToken(); n->setChildNodes(nodes); @@ -59,28 +58,31 @@ return n; } -RssFeedNode::RssFeedNode(const Grantlee::FilterExpression& url, const Grantlee::FilterExpression& query, QObject* parent) - : Grantlee::Node(parent), m_url(url), m_query(query) +RssFeedNode::RssFeedNode(const Grantlee::FilterExpression &url, + const Grantlee::FilterExpression &query, + QObject *parent) + : Grantlee::Node(parent), m_url(url), m_query(query) { - } -void RssFeedNode::setChildNodes(QList< Grantlee::Node* > childNodes) +void RssFeedNode::setChildNodes(QList childNodes) { m_childNodes = childNodes; } -void RssFeedNode::render(Grantlee::OutputStream* stream, Grantlee::Context* c) const +void RssFeedNode::render(Grantlee::OutputStream *stream, + Grantlee::Context *c) const { - QNetworkAccessManager *mgr = new QNetworkAccessManager(this); + QNetworkAccessManager *mgr + = new QNetworkAccessManager(const_cast(this)); QUrl url(Grantlee::getSafeString(m_url.resolve(c))); QNetworkReply *reply = mgr->get(QNetworkRequest(url)); QEventLoop eLoop; - connect( mgr, SIGNAL( finished( QNetworkReply * ) ), &eLoop, SLOT( quit() ) ); - eLoop.exec( QEventLoop::ExcludeUserInputEvents ); + connect(mgr, SIGNAL(finished(QNetworkReply *)), &eLoop, SLOT(quit())); + eLoop.exec(QEventLoop::ExcludeUserInputEvents); c->push(); - foreach(Grantlee::Node *n, m_childNodes) { + foreach (Grantlee::Node *n, m_childNodes) { if (!n->inherits(XmlNamespaceNode::staticMetaObject.className())) continue; Grantlee::OutputStream _dummy; @@ -98,14 +100,19 @@ QHash h = c->lookup("_ns").toHash(); QHash::const_iterator it = h.constBegin(); const QHash::const_iterator end = h.constEnd(); - for ( ; it != end; ++it ) { + for (; it != end; ++it) { if (it.key().isEmpty()) { - ns += QStringLiteral( "declare default element namespace " ) + QLatin1Literal( " \"" ) + it.value().toString() + QLatin1Literal( "\";\n" ); + ns += QStringLiteral("declare default element namespace ") + + QLatin1Literal(" \"") + it.value().toString() + + QLatin1Literal("\";\n"); } else { - ns += QStringLiteral( "declare namespace " ) + it.key() + QLatin1Literal( " = \"" ) + it.value().toString() + QLatin1Literal( "\";\n" ); + ns += QStringLiteral("declare namespace ") + it.key() + + QLatin1Literal(" = \"") + it.value().toString() + + QLatin1Literal("\";\n"); } } - query.setQuery(ns + "doc($inputDocument)" + Grantlee::getSafeString(m_query.resolve(c)).get()); + query.setQuery(ns + "doc($inputDocument)" + + Grantlee::getSafeString(m_query.resolve(c)).get()); QXmlResultItems result; query.evaluateTo(&result); @@ -113,38 +120,36 @@ QXmlItem item(result.next()); int count = 0; while (!item.isNull()) { - if (count++ > 20) - break; - query.setFocus(item); - c->push(); - foreach(Grantlee::Node *n, m_childNodes) { - if (n->inherits(XmlNamespaceNode::staticMetaObject.className())) - continue; - c->insert("_q", QVariant::fromValue(query)); - n->render(stream, c); - } - c->pop(); - item = result.next(); + if (count++ > 20) + break; + query.setFocus(item); + c->push(); + foreach (Grantlee::Node *n, m_childNodes) { + if (n->inherits(XmlNamespaceNode::staticMetaObject.className())) + continue; + c->insert("_q", QVariant::fromValue(query)); + n->render(stream, c); + } + c->pop(); + item = result.next(); } c->pop(); } -XmlRoleNodeFactory::XmlRoleNodeFactory(QObject* parent) -{ - -} +XmlRoleNodeFactory::XmlRoleNodeFactory(QObject *parent) {} -Grantlee::Node* XmlRoleNodeFactory::getNode(const QString &tagContent, Grantlee::Parser *p) const +Grantlee::Node *XmlRoleNodeFactory::getNode(const QString &tagContent, + Grantlee::Parser *p) const { QStringList expr = smartSplit(tagContent); Grantlee::FilterExpression query(expr.at(1), p); return new XmlRoleNode(query); } -XmlRoleNode::XmlRoleNode(const Grantlee::FilterExpression &query, QObject* parent) - : m_query(query), m_count(0) +XmlRoleNode::XmlRoleNode(const Grantlee::FilterExpression &query, + QObject *parent) + : m_query(query), m_count(0) { - } static QString unescape(const QString &_input) @@ -157,32 +162,35 @@ return input; } -void XmlRoleNode::render(Grantlee::OutputStream *stream, Grantlee::Context *c) const +void XmlRoleNode::render(Grantlee::OutputStream *stream, + Grantlee::Context *c) const { QXmlQuery q = c->lookup("_q").value(); QHash h = c->lookup("_ns").toHash(); QString ns; QHash::const_iterator it = h.constBegin(); const QHash::const_iterator end = h.constEnd(); - for ( ; it != end; ++it ) { + for (; it != end; ++it) { if (it.key().isEmpty()) { - ns += QStringLiteral( "declare default element namespace " ) + QLatin1Literal( " \"" ) + it.value().toString() + QLatin1Literal( "\";\n" ); + ns += QStringLiteral("declare default element namespace ") + + QLatin1Literal(" \"") + it.value().toString() + + QLatin1Literal("\";\n"); } else { - ns += QStringLiteral( "declare namespace " ) + it.key() + QLatin1Literal( " = \"" ) + it.value().toString() + QLatin1Literal( "\";\n" ); + ns += QStringLiteral("declare namespace ") + it.key() + + QLatin1Literal(" = \"") + it.value().toString() + + QLatin1Literal("\";\n"); } } q.setQuery(ns + Grantlee::getSafeString(m_query.resolve(c))); QString s; q.evaluateTo(&s); - ( *stream ) << unescape(s); + (*stream) << unescape(s); } -XmlNamespaceNodeFactory::XmlNamespaceNodeFactory(QObject* parent) -{ - -} +XmlNamespaceNodeFactory::XmlNamespaceNodeFactory(QObject *parent) {} -Grantlee::Node* XmlNamespaceNodeFactory::getNode(const QString &tagContent, Grantlee::Parser *p) const +Grantlee::Node *XmlNamespaceNodeFactory::getNode(const QString &tagContent, + Grantlee::Parser *p) const { QStringList expr = smartSplit(tagContent); Grantlee::FilterExpression query(expr.at(1), p); @@ -192,13 +200,14 @@ return new XmlNamespaceNode(query, name); } -XmlNamespaceNode::XmlNamespaceNode(const Grantlee::FilterExpression &query, const QString &name, QObject* parent) - : m_query(query), m_name(name) +XmlNamespaceNode::XmlNamespaceNode(const Grantlee::FilterExpression &query, + const QString &name, QObject *parent) + : m_query(query), m_name(name) { - } -void XmlNamespaceNode::render(Grantlee::OutputStream *stream, Grantlee::Context *c) const +void XmlNamespaceNode::render(Grantlee::OutputStream *stream, + Grantlee::Context *c) const { QString q = Grantlee::getSafeString(m_query.resolve(c)); QHash h = c->lookup("_ns").toHash(); @@ -206,7 +215,8 @@ c->insert("_ns", h); } -QVariant ResizeFilter::doFilter(const QVariant& input, const QVariant& argument, bool autoescape) const +QVariant ResizeFilter::doFilter(const QVariant &input, const QVariant &argument, + bool autoescape) const { QString url = Grantlee::getSafeString(input); url.replace("_s", "_z"); diff -Nru grantlee5-5.0.0/examples/htmlapps/rssfeed.h grantlee5-5.1.0/examples/htmlapps/rssfeed.h --- grantlee5-5.0.0/examples/htmlapps/rssfeed.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/rssfeed.h 2016-04-19 06:33:17.000000000 +0000 @@ -21,8 +21,8 @@ #ifndef RSS_FEED_H #define RSS_FEED_H -#include #include +#include namespace Grantlee { @@ -37,24 +37,26 @@ public: RssFeedNodeFactory(QObject *parent = 0); - virtual Grantlee::Node* getNode(const QString& tagContent, Grantlee::Parser* p) const; - + virtual Grantlee::Node *getNode(const QString &tagContent, + Grantlee::Parser *p) const; }; class RssFeedNode : public Grantlee::Node { Q_OBJECT public: - RssFeedNode(const Grantlee::FilterExpression &url, const Grantlee::FilterExpression &query, QObject *parent = 0); + RssFeedNode(const Grantlee::FilterExpression &url, + const Grantlee::FilterExpression &query, QObject *parent = 0); - void setChildNodes(QList childNodes); + void setChildNodes(QList childNodes); - virtual void render(Grantlee::OutputStream* stream, Grantlee::Context* c) const; + virtual void render(Grantlee::OutputStream *stream, + Grantlee::Context *c) const; private: Grantlee::FilterExpression m_url; Grantlee::FilterExpression m_query; - QList m_childNodes; + QList m_childNodes; }; class XmlRoleNodeFactory : public Grantlee::AbstractNodeFactory @@ -63,8 +65,8 @@ public: XmlRoleNodeFactory(QObject *parent = 0); - virtual Grantlee::Node* getNode(const QString& tagContent, Grantlee::Parser* p) const; - + virtual Grantlee::Node *getNode(const QString &tagContent, + Grantlee::Parser *p) const; }; class XmlRoleNode : public Grantlee::Node @@ -73,7 +75,8 @@ public: XmlRoleNode(const Grantlee::FilterExpression &query, QObject *parent = 0); - virtual void render(Grantlee::OutputStream* stream, Grantlee::Context* c) const; + virtual void render(Grantlee::OutputStream *stream, + Grantlee::Context *c) const; private: Grantlee::FilterExpression m_name; @@ -87,17 +90,19 @@ public: XmlNamespaceNodeFactory(QObject *parent = 0); - virtual Grantlee::Node* getNode(const QString& tagContent, Grantlee::Parser* p) const; - + virtual Grantlee::Node *getNode(const QString &tagContent, + Grantlee::Parser *p) const; }; class XmlNamespaceNode : public Grantlee::Node { Q_OBJECT public: - XmlNamespaceNode(const Grantlee::FilterExpression &query, const QString &name, QObject *parent = 0); + XmlNamespaceNode(const Grantlee::FilterExpression &query, const QString &name, + QObject *parent = 0); - virtual void render(Grantlee::OutputStream* stream, Grantlee::Context* c) const; + virtual void render(Grantlee::OutputStream *stream, + Grantlee::Context *c) const; private: QString m_name; @@ -107,7 +112,9 @@ class ResizeFilter : public Grantlee::Filter { public: - QVariant doFilter( const QVariant &input, const QVariant &argument = QVariant(), bool autoescape = false ) const; + QVariant doFilter(const QVariant &input, + const QVariant &argument = QVariant(), + bool autoescape = false) const; }; #endif diff -Nru grantlee5-5.0.0/examples/htmlapps/templatereply.cpp grantlee5-5.1.0/examples/htmlapps/templatereply.cpp --- grantlee5-5.0.0/examples/htmlapps/templatereply.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/templatereply.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -5,38 +5,29 @@ #include -TemplateReply::TemplateReply(const QNetworkRequest &req, const QNetworkAccessManager::Operation op, Grantlee::Template t, Grantlee::Context c, QObject* parent) - : QNetworkReply(parent), m_t(t), m_c(c), m_buffer(new QBuffer(this)) -{ - setRequest(req); - setUrl(req.url()); - setOperation(op); +TemplateReply::TemplateReply(const QNetworkRequest &req, + const QNetworkAccessManager::Operation op, + Grantlee::Template t, Grantlee::Context c, + QObject *parent) + : QNetworkReply(parent), m_t(t), m_c(c), m_buffer(new QBuffer(this)) +{ + setRequest(req); + setUrl(req.url()); + setOperation(op); } -bool TemplateReply::atEnd() const -{ - return m_buffer->atEnd(); -} +bool TemplateReply::atEnd() const { return m_buffer->atEnd(); } qint64 TemplateReply::bytesAvailable() const { return m_buffer->bytesAvailable() + QNetworkReply::bytesAvailable(); } -bool TemplateReply::canReadLine() const -{ - return m_buffer->canReadLine(); -} +bool TemplateReply::canReadLine() const { return m_buffer->canReadLine(); } -void TemplateReply::close() -{ - QNetworkReply::close(); -} +void TemplateReply::close() { QNetworkReply::close(); } -bool TemplateReply::isSequential() const -{ - return m_buffer->isSequential(); -} +bool TemplateReply::isSequential() const { return m_buffer->isSequential(); } bool TemplateReply::open(QIODevice::OpenMode mode) { @@ -54,20 +45,11 @@ return b; } -qint64 TemplateReply::pos() const -{ - return m_buffer->pos(); -} +qint64 TemplateReply::pos() const { return m_buffer->pos(); } -bool TemplateReply::reset() -{ - return m_buffer->reset(); -} +bool TemplateReply::reset() { return m_buffer->reset(); } -bool TemplateReply::seek(qint64 pos) -{ - return m_buffer->seek(pos); -} +bool TemplateReply::seek(qint64 pos) { return m_buffer->seek(pos); } void TemplateReply::setReadBufferSize(qint64 size) { @@ -84,12 +66,9 @@ return m_buffer->waitForReadyRead(msecs); } -void TemplateReply::abort() -{ - m_buffer->buffer().clear(); -} +void TemplateReply::abort() { m_buffer->buffer().clear(); } -qint64 TemplateReply::readData(char* data, qint64 maxlen) +qint64 TemplateReply::readData(char *data, qint64 maxlen) { return m_buffer->read(data, maxlen); } diff -Nru grantlee5-5.0.0/examples/htmlapps/templatereply.h grantlee5-5.1.0/examples/htmlapps/templatereply.h --- grantlee5-5.0.0/examples/htmlapps/templatereply.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/htmlapps/templatereply.h 2016-04-19 06:33:17.000000000 +0000 @@ -6,17 +6,19 @@ #include #include -#include #include +#include class TemplateReply : public QNetworkReply { Q_OBJECT public: - TemplateReply(const QNetworkRequest &req, const QNetworkAccessManager::Operation op, Grantlee::Template t, Grantlee::Context c, QObject *parent = 0); + TemplateReply(const QNetworkRequest &req, + const QNetworkAccessManager::Operation op, Grantlee::Template t, + Grantlee::Context c, QObject *parent = 0); virtual void abort(); - virtual qint64 readData(char* data, qint64 maxlen); + virtual qint64 readData(char *data, qint64 maxlen); virtual bool atEnd() const; virtual qint64 bytesAvailable() const; virtual bool canReadLine() const; diff -Nru grantlee5-5.0.0/examples/textedit/audioobject.cpp grantlee5-5.1.0/examples/textedit/audioobject.cpp --- grantlee5-5.0.0/examples/textedit/audioobject.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/textedit/audioobject.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -24,38 +24,33 @@ #include -AudioObject::AudioObject(QObject* parent) - : QObject(parent) -{ - -} +AudioObject::AudioObject(QObject *parent) : QObject(parent) {} - -void AudioObject::drawObject( QPainter* painter, const QRectF& rect, QTextDocument* doc, int posInDocument, const QTextFormat& format ) +void AudioObject::drawObject(QPainter *painter, const QRectF &rect, + QTextDocument *doc, int posInDocument, + const QTextFormat &format) { - painter->setBrush( Qt::darkGreen ); - painter->drawRect( rect ); + painter->setBrush(Qt::darkGreen); + painter->drawRect(rect); - painter->setBrush( Qt::white ); - QRect circleRect(rect.left() + 2.0, rect.top() + 2.0, rect.width() - 4.0, rect.height() - 4.0 ); - painter->drawEllipse( circleRect ); - - painter->setBrush( Qt::green ); - const QPointF points[3] = { - QPointF( circleRect.left() + 7.0, circleRect.top() + 4.0 ), - QPointF( circleRect.right() - 4.0, circleRect.top() + 4.0 + ( ( circleRect.height() - 8.0) / 2.0 ) ), - QPointF( circleRect.left() + 7.0, circleRect.bottom() - 4.0 ) - }; + painter->setBrush(Qt::white); + QRect circleRect(rect.left() + 2.0, rect.top() + 2.0, rect.width() - 4.0, + rect.height() - 4.0); + painter->drawEllipse(circleRect); + + painter->setBrush(Qt::green); + const QPointF points[3] + = {QPointF(circleRect.left() + 7.0, circleRect.top() + 4.0), + QPointF(circleRect.right() - 4.0, + circleRect.top() + 4.0 + ((circleRect.height() - 8.0) / 2.0)), + QPointF(circleRect.left() + 7.0, circleRect.bottom() - 4.0)}; painter->drawPolygon(points, 3); } -QSizeF AudioObject::intrinsicSize( QTextDocument* doc, int posInDocument, const QTextFormat& format ) +QSizeF AudioObject::intrinsicSize(QTextDocument *doc, int posInDocument, + const QTextFormat &format) { - return QSizeF( 30, 30 ); + return QSizeF(30, 30); } -AudioFormat::AudioFormat() - : QTextCharFormat() -{ - setObjectType( AudioType ); -} +AudioFormat::AudioFormat() : QTextCharFormat() { setObjectType(AudioType); } diff -Nru grantlee5-5.0.0/examples/textedit/audioobject.h grantlee5-5.1.0/examples/textedit/audioobject.h --- grantlee5-5.0.0/examples/textedit/audioobject.h 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/textedit/audioobject.h 2016-04-19 06:33:17.000000000 +0000 @@ -18,28 +18,24 @@ */ - #ifndef AUDIOOBJECT_H #define AUDIOOBJECT_H -#include #include +#include -enum CustomType -{ +enum CustomType { AudioType = QTextFormat::UserObject, NumTypes }; -enum CustomProperty -{ +enum CustomProperty { AudioProperty = QTextFormat::UserProperty, NumProperties }; - /** @brief A text object representing an audio snippet */ @@ -48,17 +44,19 @@ Q_OBJECT Q_INTERFACES(QTextObjectInterface) public: - AudioObject( QObject *parent = 0 ); + AudioObject(QObject *parent = 0); - virtual void drawObject(QPainter* painter, const QRectF& rect, QTextDocument* doc, int posInDocument, const QTextFormat& format); - virtual QSizeF intrinsicSize(QTextDocument* doc, int posInDocument, const QTextFormat& format); + virtual void drawObject(QPainter *painter, const QRectF &rect, + QTextDocument *doc, int posInDocument, + const QTextFormat &format); + virtual QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, + const QTextFormat &format); }; class AudioFormat : public QTextCharFormat { public: AudioFormat(); - }; #endif // AUDIOOBJECT_H diff -Nru grantlee5-5.0.0/examples/textedit/audiotextdocumentoutputter.cpp grantlee5-5.1.0/examples/textedit/audiotextdocumentoutputter.cpp --- grantlee5-5.0.0/examples/textedit/audiotextdocumentoutputter.cpp 2014-09-24 16:11:57.000000000 +0000 +++ grantlee5-5.1.0/examples/textedit/audiotextdocumentoutputter.cpp 2016-04-19 06:33:17.000000000 +0000 @@ -20,41 +20,36 @@ #include "audiotextdocumentoutputter.h" -AudioTextHtmlBuilder::AudioTextHtmlBuilder() -{ - -} +AudioTextHtmlBuilder::AudioTextHtmlBuilder() {} -void AudioTextHtmlBuilder::addAudioTag( const QString &source ) +void AudioTextHtmlBuilder::addAudioTag(const QString &source) { - appendLiteralText( QString( "