grantlee:grantlee.git
4 years agoFix word-wrap filter 12
Wouter Haffmans [Thu, 26 Sep 2013 20:51:20 +0000 (22:51 +0200)]
Fix word-wrap filter

Position must be reset when starting new lines (e.g. because the part
has multiple lines, or when we wrap words), rather than incremented.

In the previous behavior the filter would wrap after every word after
the first line, now it fills up lines as expected.

4 years agoCreate a static library instead of compiling some files N times.
Stephen Kelly [Tue, 24 Sep 2013 15:43:02 +0000 (17:43 +0200)]
Create a static library instead of compiling some files N times.

Also make use of the automoc feature in the tests.

4 years agoAdd API for resolving variables to strings in QtScript.
Stephen Kelly [Sat, 21 Sep 2013 09:41:22 +0000 (11:41 +0200)]
Add API for resolving variables to strings in QtScript.

4 years agoFix the htmlapps example with Qt 4.8+
Stephen Kelly [Sat, 21 Sep 2013 08:44:09 +0000 (10:44 +0200)]
Fix the htmlapps example with Qt 4.8+

A behavior change exposed a bug in the QNetworkReply subclass. Account
for the buffer in the base.

4 years agoAdd missing includes.
Stephen Kelly [Wed, 11 Sep 2013 12:30:35 +0000 (14:30 +0200)]
Add missing includes.

4 years agoReplace module includes with class includes in examples.
Stephen Kelly [Fri, 6 Sep 2013 15:51:57 +0000 (17:51 +0200)]
Replace module includes with class includes in examples.

This is more portable to Qt 5.

4 years agoComment out the identica page.
Stephen Kelly [Fri, 6 Sep 2013 15:43:28 +0000 (17:43 +0200)]
Comment out the identica page.

It no longer provides an rss feed.

4 years agoLoad jQuery by the correct version.
Stephen Kelly [Fri, 6 Sep 2013 15:42:20 +0000 (17:42 +0200)]
Load jQuery by the correct version.

4 years agoReplace old compressed jquery with the latest release.
Stephen Kelly [Fri, 6 Sep 2013 15:18:48 +0000 (17:18 +0200)]
Replace old compressed jquery with the latest release.

This example does not work anyway because QIODevice::peek is not
virtual. Hopefully this can be worked around with Qt 5.

4 years agoDon't try to read from a null QObject*.
Stephen Kelly [Thu, 5 Sep 2013 09:18:04 +0000 (11:18 +0200)]
Don't try to read from a null QObject*.

4 years agoDon't uselessly store the template as a member.
Stephen Kelly [Tue, 3 Sep 2013 15:12:51 +0000 (17:12 +0200)]
Don't uselessly store the template as a member.

4 years agoFix build in the presence of QStringBuilder.
Stephen Kelly [Tue, 3 Sep 2013 13:50:47 +0000 (15:50 +0200)]
Fix build in the presence of QStringBuilder.

4 years agoAvoid unsigned comparison with 0 warning.
Stephen Kelly [Tue, 3 Sep 2013 13:54:33 +0000 (15:54 +0200)]
Avoid unsigned comparison with 0 warning.

When GRANTLEE_MIN_PLUGIN_VERSION is reset to zero, we would otherwise
get a warning from this code.

4 years agoRead SOURCES directly from targets for the cccc target.
Stephen Kelly [Tue, 3 Sep 2013 11:03:21 +0000 (13:03 +0200)]
Read SOURCES directly from targets for the cccc target.

Don't maintain a GLOBAL property containing the source lists.

4 years agoInstall the grantlee_textdocument.h header.
Stephen Kelly [Tue, 3 Sep 2013 10:51:17 +0000 (12:51 +0200)]
Install the grantlee_textdocument.h header.

4 years agoUse non-deprecated variables.
Stephen Kelly [Tue, 3 Sep 2013 10:46:33 +0000 (12:46 +0200)]
Use non-deprecated variables.

4 years agoUse the non-obsolete grantlee_templates header where needed.
Stephen Kelly [Tue, 3 Sep 2013 10:17:36 +0000 (12:17 +0200)]
Use the non-obsolete grantlee_templates header where needed.

4 years agoGenerate the min plugin version from the major version.
Stephen Kelly [Tue, 3 Sep 2013 10:14:00 +0000 (12:14 +0200)]
Generate the min plugin version from the major version.

4 years agoSet the SOVERSION to the Grantlee major version.
Stephen Kelly [Mon, 2 Sep 2013 17:56:52 +0000 (19:56 +0200)]
Set the SOVERSION to the Grantlee major version.

4 years agoAdd a convenience buildsystem for the examples.
Stephen Kelly [Tue, 3 Sep 2013 10:27:43 +0000 (12:27 +0200)]
Add a convenience buildsystem for the examples.

4 years agoDon't rely on order for QSet related tests.
Stephen Kelly [Mon, 2 Sep 2013 16:12:17 +0000 (18:12 +0200)]
Don't rely on order for QSet related tests.

In Qt 5 this is not deterministic.

4 years agoRemove stray debug output.
Stephen Kelly [Mon, 2 Sep 2013 16:16:34 +0000 (18:16 +0200)]
Remove stray debug output.

4 years agoReturn the library if it is found.
Stephen Kelly [Mon, 2 Sep 2013 15:20:51 +0000 (17:20 +0200)]
Return the library if it is found.

This fixes a regression in commit 0ee5d83d (Ensure that we never
decrement a uint below 0., 2013-09-02).

4 years agoDon't rely on order of elements in QHash.
Stephen Kelly [Mon, 2 Sep 2013 14:43:26 +0000 (16:43 +0200)]
Don't rely on order of elements in QHash.

In Qt 5, this is not determinate.

4 years agoEnsure that we never decrement a uint below 0.
Stephen Kelly [Mon, 2 Sep 2013 14:42:08 +0000 (16:42 +0200)]
Ensure that we never decrement a uint below 0.

4 years agoAdd missing include.
Stephen Kelly [Mon, 2 Sep 2013 12:58:04 +0000 (14:58 +0200)]
Add missing include.

4 years agoUse an empty endmacro() command.
Stephen Kelly [Mon, 2 Sep 2013 11:52:10 +0000 (13:52 +0200)]
Use an empty endmacro() command.

4 years agoUse list(APPEND) where appropriate.
Stephen Kelly [Mon, 2 Sep 2013 11:31:22 +0000 (13:31 +0200)]
Use list(APPEND) where appropriate.

4 years agoUse CMAKE_AUTOMOC instead of qt4_automoc.
Stephen Kelly [Mon, 2 Sep 2013 11:15:36 +0000 (13:15 +0200)]
Use CMAKE_AUTOMOC instead of qt4_automoc.

4 years agoIncrease the CMake requirement for examples and tests.
Stephen Kelly [Mon, 2 Sep 2013 11:13:49 +0000 (13:13 +0200)]
Increase the CMake requirement for examples and tests.

Match the requirement of grantlee itself.

4 years agoUse Qt4 IMPORTED target names directly.
Stephen Kelly [Mon, 2 Sep 2013 11:10:55 +0000 (13:10 +0200)]
Use Qt4 IMPORTED target names directly.

Instead of using variables.

4 years agoRemove unneeded find_package(Qt4)
Stephen Kelly [Mon, 2 Sep 2013 11:09:18 +0000 (13:09 +0200)]
Remove unneeded find_package(Qt4)

GrantleeConfig already does this.

4 years agoRemove unneeded QT_NO_KEYWORDS definition.
Stephen Kelly [Mon, 2 Sep 2013 11:08:57 +0000 (13:08 +0200)]
Remove unneeded QT_NO_KEYWORDS definition.

4 years agoAdd some uniformity to command invocation.
Stephen Kelly [Mon, 2 Sep 2013 11:07:49 +0000 (13:07 +0200)]
Add some uniformity to command invocation.

4 years agoPrefer CMAKE_INCLUDE_CURRENT_DIR over explicit binary dir listing.
Stephen Kelly [Mon, 2 Sep 2013 10:49:38 +0000 (12:49 +0200)]
Prefer CMAKE_INCLUDE_CURRENT_DIR over explicit binary dir listing.

4 years agoDon't use QT_NO_KEYWORDS in examples.
Stephen Kelly [Mon, 2 Sep 2013 10:47:56 +0000 (12:47 +0200)]
Don't use QT_NO_KEYWORDS in examples.

It is not really needed.

4 years agoUse Qt4 IMPORTED target names directly.
Stephen Kelly [Mon, 2 Sep 2013 10:28:35 +0000 (12:28 +0200)]
Use Qt4 IMPORTED target names directly.

Instead of using variables.

4 years agoRemove QT_DEFINITIONS where not needed.
Stephen Kelly [Mon, 2 Sep 2013 10:27:53 +0000 (12:27 +0200)]
Remove QT_DEFINITIONS where not needed.

Grantlee_USE_FILE already does this (via QT_USE_FILE).

4 years agoRemove add_definitions(-DQT_GUI_LIB) where not needed.
Stephen Kelly [Mon, 2 Sep 2013 10:27:25 +0000 (12:27 +0200)]
Remove add_definitions(-DQT_GUI_LIB) where not needed.

4 years agoRemove some find_package(Qt4) calls.
Stephen Kelly [Mon, 2 Sep 2013 10:26:15 +0000 (12:26 +0200)]
Remove some find_package(Qt4) calls.

GrantleeConfig.cmake already does this.

4 years agoDon't use multiple add_definitions calls where one will do.
Stephen Kelly [Mon, 2 Sep 2013 10:17:30 +0000 (12:17 +0200)]
Don't use multiple add_definitions calls where one will do.

4 years agoAdd missing newline.
Stephen Kelly [Mon, 2 Sep 2013 10:10:22 +0000 (12:10 +0200)]
Add missing newline.

4 years agoPort away from CMAKE_AUTOMOC_RELAXED_MODE.
Stephen Kelly [Mon, 2 Sep 2013 10:05:21 +0000 (12:05 +0200)]
Port away from CMAKE_AUTOMOC_RELAXED_MODE.

4 years agoRemove use of obsolete IMMEDIATE option.
Stephen Kelly [Mon, 2 Sep 2013 10:01:29 +0000 (12:01 +0200)]
Remove use of obsolete IMMEDIATE option.

4 years agoFix memory leak - delete private instance.
Stephen Kelly [Mon, 2 Sep 2013 08:35:56 +0000 (10:35 +0200)]
Fix memory leak - delete private instance.

4 years agoAvoid manipulation of CMAKE_BUILD_TYPE when it is not there.
Stephen Kelly [Thu, 4 Jul 2013 09:12:22 +0000 (11:12 +0200)]
Avoid manipulation of CMAKE_BUILD_TYPE when it is not there.

5 years agoUse the LINK_ scope keywords and IMPORTED targets directly with tll().
Stephen Kelly [Fri, 15 Mar 2013 17:39:01 +0000 (18:39 +0100)]
Use the LINK_ scope keywords and IMPORTED targets directly with tll().

5 years agoTrim trailing whitespace.
Stephen Kelly [Fri, 15 Mar 2013 17:36:03 +0000 (18:36 +0100)]
Trim trailing whitespace.

5 years agoUse to/fromLatin1 instead of to/fromAscii
Stephen Kelly [Fri, 15 Mar 2013 17:35:23 +0000 (18:35 +0100)]
Use to/fromLatin1 instead of to/fromAscii

The latter is deprecated, and usually calls the former anyway.

5 years agoRemove version variables from the Config file.
Stephen Kelly [Fri, 15 Mar 2013 17:30:38 +0000 (18:30 +0100)]
Remove version variables from the Config file.

These are already set by CMake because we have a ConfigVersion file.

5 years agoUse CMake to generate a ConfigVersion file.
Stephen Kelly [Fri, 15 Mar 2013 17:29:35 +0000 (18:29 +0100)]
Use CMake to generate a ConfigVersion file.

Instead of maintaining the file template here.

5 years agoNamespace the variable for the root directory of the package.
Stephen Kelly [Fri, 15 Mar 2013 17:25:39 +0000 (18:25 +0100)]
Namespace the variable for the root directory of the package.

Otherwise things like this can cause problems if the same variable
is used by a downstream, or by another upstream of a Grantlee downstream.

5 years agoUse CMAKE_CURRENT_LIST_DIR where appropriate.
Stephen Kelly [Fri, 15 Mar 2013 17:25:09 +0000 (18:25 +0100)]
Use CMAKE_CURRENT_LIST_DIR where appropriate.

5 years agoUse the CMAKE_AUTOMOC feature in Grantlee.
Stephen Kelly [Fri, 15 Mar 2013 17:21:52 +0000 (18:21 +0100)]
Use the CMAKE_AUTOMOC feature in Grantlee.

5 years agoUse CMakeParseArguments from upstream.
Stephen Kelly [Fri, 15 Mar 2013 17:17:08 +0000 (18:17 +0100)]
Use CMakeParseArguments from upstream.

Remove the Grantlee fork of it.

5 years agoUse GenerateExportHeader from CMake upstream.
Stephen Kelly [Fri, 15 Mar 2013 17:16:05 +0000 (18:16 +0100)]
Use GenerateExportHeader from CMake upstream.

Remove the Grantlee fork of it.

5 years agoBump Grantlee CMake requirement to 2.8.9.
Stephen Kelly [Fri, 15 Mar 2013 17:14:24 +0000 (18:14 +0100)]
Bump Grantlee CMake requirement to 2.8.9.

This will allow many cleanups.

5 years agoFind qtestlib only where it is needed.
Stephen Kelly [Thu, 14 Mar 2013 19:53:25 +0000 (20:53 +0100)]
Find qtestlib only where it is needed.

Fixes https://bugs.gentoo.org/show_bug.cgi?id=409131

5 years agoBump version.
Stephen Kelly [Thu, 14 Mar 2013 19:56:09 +0000 (20:56 +0100)]
Bump version.

5 years agoBump the version for the next release. v0.3.0
Stephen Kelly [Thu, 1 Nov 2012 20:14:18 +0000 (21:14 +0100)]
Bump the version for the next release.

5 years agoAdd new line after a list item.
Montel Laurent [Fri, 19 Oct 2012 10:40:41 +0000 (12:40 +0200)]
Add new line after a list item.

Don't add it when list item is empty string

5 years agoAdd support for roman style
Montel Laurent [Fri, 19 Oct 2012 09:44:16 +0000 (11:44 +0200)]
Add support for roman style

5 years agoRemove unused variables.
Stephen Kelly [Sat, 20 Oct 2012 06:45:27 +0000 (08:45 +0200)]
Remove unused variables.

5 years agoFix some includes.
Stephen Kelly [Sun, 12 Aug 2012 14:04:08 +0000 (16:04 +0200)]
Fix some includes.

6 years agoUse a QVector of filters instead of a QList.
Stephen Kelly [Mon, 26 Dec 2011 23:33:57 +0000 (00:33 +0100)]
Use a QVector of filters instead of a QList.

6 years agoAssert on the required internal type in a cycle tag.
Stephen Kelly [Mon, 26 Dec 2011 23:29:15 +0000 (00:29 +0100)]
Assert on the required internal type in a cycle tag.

6 years agoTest the null localizer plural behaviour.
Stephen Kelly [Mon, 26 Dec 2011 23:27:37 +0000 (00:27 +0100)]
Test the null localizer plural behaviour.

6 years agoTest the population of the externalMedia context container.
Stephen Kelly [Mon, 26 Dec 2011 23:26:45 +0000 (00:26 +0100)]
Test the population of the externalMedia context container.

6 years agoTest MetaEnumVariable default ctor.
Stephen Kelly [Mon, 26 Dec 2011 23:26:14 +0000 (00:26 +0100)]
Test MetaEnumVariable default ctor.

6 years agoUse QLocale provided numerical parsing instead of guess-work.
Stephen Kelly [Mon, 26 Dec 2011 23:23:33 +0000 (00:23 +0100)]
Use QLocale provided numerical parsing instead of guess-work.

6 years agoUse iterators instead of Q_FOREACH to avoid container copies.
Stephen Kelly [Mon, 26 Dec 2011 23:22:28 +0000 (00:22 +0100)]
Use iterators instead of Q_FOREACH to avoid container copies.

6 years agoAssert expected invariant instead of testing it.
Stephen Kelly [Mon, 26 Dec 2011 23:21:50 +0000 (00:21 +0100)]
Assert expected invariant instead of testing it.

6 years agobreak instead of return 'early' from a function.
Stephen Kelly [Mon, 26 Dec 2011 23:20:18 +0000 (00:20 +0100)]
break instead of return 'early' from a function.

Satisfies TestCocoon loop coverage logic.

6 years agoExpect tested loop termination.
Stephen Kelly [Mon, 26 Dec 2011 23:20:01 +0000 (00:20 +0100)]
Expect tested loop termination.

6 years agoRemove unused methods.
Stephen Kelly [Mon, 26 Dec 2011 23:19:00 +0000 (00:19 +0100)]
Remove unused methods.

6 years agoRemove unnecessary runtime check.
Stephen Kelly [Mon, 26 Dec 2011 23:18:08 +0000 (00:18 +0100)]
Remove unnecessary runtime check.

Using qobject_cast on a 0 works as expected already. The if() gains
us nothing.

6 years agoCombine two ctors into one.
Stephen Kelly [Mon, 26 Dec 2011 23:17:34 +0000 (00:17 +0100)]
Combine two ctors into one.

6 years agoLet Qt report the error on an empty container.
Stephen Kelly [Mon, 26 Dec 2011 23:16:22 +0000 (00:16 +0100)]
Let Qt report the error on an empty container.

6 years agoRemove dead code.
Stephen Kelly [Mon, 26 Dec 2011 23:15:30 +0000 (00:15 +0100)]
Remove dead code.

Don't use assert() + if(). The assert is enough.

6 years agoRemove dead code.
Stephen Kelly [Mon, 26 Dec 2011 23:14:34 +0000 (00:14 +0100)]
Remove dead code.

Assert what is guaranteed by the state machine rather than checking
for it.

6 years agoFix style.
Stephen Kelly [Mon, 26 Dec 2011 23:14:07 +0000 (00:14 +0100)]
Fix style.

6 years agoUse iterators instead of Q_FOREACH
Stephen Kelly [Mon, 26 Dec 2011 23:13:36 +0000 (00:13 +0100)]
Use iterators instead of Q_FOREACH

Ensures that we never copy the container.

6 years agoCheck for int, not long.
Stephen Kelly [Mon, 26 Dec 2011 23:12:50 +0000 (00:12 +0100)]
Check for int, not long.

This is already converted by other code.

6 years agoTest behavior of _() syntax.
Stephen Kelly [Mon, 26 Dec 2011 23:30:16 +0000 (00:30 +0100)]
Test behavior of _() syntax.

6 years agoTest expected results of the localizer on a Context.
Stephen Kelly [Tue, 20 Dec 2011 03:15:02 +0000 (04:15 +0100)]
Test expected results of the localizer on a Context.

6 years agoAdd some tests for assignment and copy construction.
Stephen Kelly [Tue, 20 Dec 2011 03:14:35 +0000 (04:14 +0100)]
Add some tests for assignment and copy construction.

6 years agoRemove dead code and test for QMap lookup.
Stephen Kelly [Sat, 3 Dec 2011 19:53:19 +0000 (20:53 +0100)]
Remove dead code and test for QMap lookup.

6 years agoRemove some dead code from variable parsing.
Stephen Kelly [Sat, 3 Dec 2011 17:50:35 +0000 (18:50 +0100)]
Remove some dead code from variable parsing.

FilterExpression already does most variable parsing for us.

6 years agoRemove truth tests and implement NullTest in terms of the base test.
Stephen Kelly [Sat, 3 Dec 2011 17:19:53 +0000 (18:19 +0100)]
Remove truth tests and implement NullTest in terms of the base test.

6 years agoRemove dead code.
Stephen Kelly [Sat, 3 Dec 2011 17:19:11 +0000 (18:19 +0100)]
Remove dead code.

The base trait needs no implementation. The specializations
always provide an implementation.

6 years agoTest last tag followed by non-newline.
Stephen Kelly [Sat, 3 Dec 2011 16:46:51 +0000 (17:46 +0100)]
Test last tag followed by non-newline.

6 years agoMake sure wrapping non-literals with lookups in _() works.
Stephen Kelly [Sat, 3 Dec 2011 16:14:17 +0000 (17:14 +0100)]
Make sure wrapping non-literals with lookups in _() works.

6 years agoAdd QString as an output type.
Stephen Kelly [Sat, 3 Dec 2011 16:12:15 +0000 (17:12 +0100)]
Add QString as an output type.

This means it is not special cased in Variable, and it is still
escaped in Node::streamValueInContext.

6 years agoIf canConvert( QVariant::String ) works, convert() will too.
Stephen Kelly [Sat, 3 Dec 2011 15:25:35 +0000 (16:25 +0100)]
If canConvert( QVariant::String ) works, convert() will too.

6 years agoTest the empty template.
Stephen Kelly [Sat, 3 Dec 2011 15:20:16 +0000 (16:20 +0100)]
Test the empty template.

6 years agoTest an unterminated if tag.
Stephen Kelly [Sat, 3 Dec 2011 15:05:22 +0000 (16:05 +0100)]
Test an unterminated if tag.

6 years agoTest an unclosed comment tag.
Stephen Kelly [Sat, 3 Dec 2011 15:05:02 +0000 (16:05 +0100)]
Test an unclosed comment tag.

6 years agoStart tests for load tag.
Stephen Kelly [Sat, 3 Dec 2011 15:04:44 +0000 (16:04 +0100)]
Start tests for load tag.

6 years agoA block tag always has a next TextNode.
Stephen Kelly [Sat, 3 Dec 2011 14:54:48 +0000 (15:54 +0100)]
A block tag always has a next TextNode.

6 years agoTest for a non-existant Qt enum
Stephen Kelly [Sat, 3 Dec 2011 14:01:31 +0000 (15:01 +0100)]
Test for a non-existant Qt enum