grantlee:grantlee.git
7 years agoMake the tests build again.
Stephen Kelly [Sun, 14 Mar 2010 21:03:14 +0000 (22:03 +0100)]
Make the tests build again.

7 years agoMake the MarkupDirector a type of AbstractBuilder and use Multiple inheritance.
Stephen Kelly [Sun, 14 Mar 2010 19:11:45 +0000 (20:11 +0100)]
Make the MarkupDirector a type of AbstractBuilder and use Multiple inheritance.

This way, it is possible to extend the output system with custom types
defined in the QTextDocument.

7 years agoConvert the API of MarkupDirector to consist mostly of iterators.
Stephen Kelly [Sun, 14 Mar 2010 19:01:43 +0000 (20:01 +0100)]
Convert the API of MarkupDirector to consist mostly of iterators.

7 years agoMake the AbstractMarkupBuilderInterface pure virtual.
Stephen Kelly [Sun, 14 Mar 2010 18:41:10 +0000 (19:41 +0100)]
Make the AbstractMarkupBuilderInterface pure virtual.

7 years agoImplement the rest of the AbstractMarkupBuilder for PlainTextMarkup
Stephen Kelly [Sun, 14 Mar 2010 21:02:46 +0000 (22:02 +0100)]
Implement the rest of the AbstractMarkupBuilder for PlainTextMarkup

7 years agoUse the standard Q_DECLARE_PRIVATE etc macros in MarkupDirector
Stephen Kelly [Sun, 14 Mar 2010 18:31:42 +0000 (19:31 +0100)]
Use the standard Q_DECLARE_PRIVATE etc macros in MarkupDirector

7 years agoFix some constness.
Stephen Kelly [Sun, 14 Mar 2010 18:28:16 +0000 (19:28 +0100)]
Fix some constness.

7 years agoFix up some newline issues with import/export
Stephen Kelly [Sun, 14 Mar 2010 14:15:58 +0000 (15:15 +0100)]
Fix up some newline issues with import/export

7 years agos/constructContent/processDocument/
Stephen Kelly [Sun, 14 Mar 2010 14:07:46 +0000 (15:07 +0100)]
s/constructContent/processDocument/

7 years agos/memberName/m_memberName
Stephen Kelly [Sun, 14 Mar 2010 14:01:51 +0000 (15:01 +0100)]
s/memberName/m_memberName

7 years agoDon't crash when the last fragment has several styles.
Stephen Kelly [Sun, 14 Mar 2010 13:58:36 +0000 (14:58 +0100)]
Don't crash when the last fragment has several styles.

7 years agoClear the stored string when returning the result.
Stephen Kelly [Sun, 14 Mar 2010 13:54:15 +0000 (14:54 +0100)]
Clear the stored string when returning the result.

7 years agoMake the builder return a QString, not a reference.
Stephen Kelly [Sun, 14 Mar 2010 13:48:52 +0000 (14:48 +0100)]
Make the builder return a QString, not a reference.

7 years agoSome minor refactoring.
Stephen Kelly [Sat, 13 Mar 2010 13:26:17 +0000 (14:26 +0100)]
Some minor refactoring.

7 years agoAdd @author line to documented headers.
Stephen Kelly [Tue, 9 Mar 2010 23:01:24 +0000 (00:01 +0100)]
Add @author line to documented headers.

7 years agoUpdate style to conform to Grantlee conventions.
Stephen Kelly [Tue, 9 Mar 2010 22:57:56 +0000 (23:57 +0100)]
Update style to conform to Grantlee conventions.

7 years agoUpdate the project description in the licence header.
Stephen Kelly [Wed, 3 Mar 2010 15:48:15 +0000 (16:48 +0100)]
Update the project description in the licence header.

7 years agos/KClass/Grantlee::Class/g
Stephen Kelly [Sun, 28 Feb 2010 20:29:28 +0000 (21:29 +0100)]
s/KClass/Grantlee::Class/g

7 years agoExport the builder system as part of the grantlee_gui library.
Stephen Kelly [Sun, 28 Feb 2010 19:56:44 +0000 (20:56 +0100)]
Export the builder system as part of the grantlee_gui library.

7 years agoRemove KDE dependancy
Stephen Kelly [Sun, 28 Feb 2010 19:52:21 +0000 (20:52 +0100)]
Remove KDE dependancy

7 years agoAdd the RichTextBuilders from kdepimlibs.
Stephen Kelly [Fri, 5 Feb 2010 17:29:37 +0000 (18:29 +0100)]
Add the RichTextBuilders from kdepimlibs.

Retrieved on 3rd Febraury 2010 from:

http://websvn.kde.org/trunk/KDE/kdepimlibs/kpimtextedit/richtextbuilders/?pathrev=1025455

7 years agoSilence compiler warning
Stephen Kelly [Sun, 14 Mar 2010 20:22:50 +0000 (21:22 +0100)]
Silence compiler warning

7 years agoRemove the grantlee_ prefix from directory names.
Stephen Kelly [Sun, 14 Mar 2010 19:36:02 +0000 (20:36 +0100)]
Remove the grantlee_ prefix from directory names.

7 years agoDon't put parseArgumments in a separate file.
Stephen Kelly [Sat, 13 Mar 2010 13:33:13 +0000 (14:33 +0100)]
Don't put parseArgumments in a separate file.

Apparently it can't be found later by consumers of Grantlee.

7 years agoInstall missing header.
Stephen Kelly [Sat, 13 Mar 2010 13:32:31 +0000 (14:32 +0100)]
Install missing header.

7 years agoCompile without millions of warnings on MinGW.
Stephen Kelly [Thu, 11 Mar 2010 18:40:22 +0000 (19:40 +0100)]
Compile without millions of warnings on MinGW.

7 years agoFix MSVC build.
Stephen Kelly [Thu, 11 Mar 2010 00:07:22 +0000 (01:07 +0100)]
Fix MSVC build.

7 years agoMake sure plugins can like to the core library.
Stephen Kelly [Wed, 10 Mar 2010 23:27:08 +0000 (00:27 +0100)]
Make sure plugins can like to the core library.

7 years agoFix the mediafinder when multiple options are available.
Stephen Kelly [Tue, 9 Mar 2010 21:36:58 +0000 (22:36 +0100)]
Fix the mediafinder when multiple options are available.

7 years agoUse the correct install dir for libraries.
Christophe Giboudeaux [Fri, 5 Mar 2010 11:49:05 +0000 (12:49 +0100)]
Use the correct install dir for libraries.

7 years agoMake it possible to implement alternative escaping to html.
Stephen Kelly [Tue, 9 Mar 2010 21:15:26 +0000 (22:15 +0100)]
Make it possible to implement alternative escaping to html.

7 years agoUpdate benchmarks
Stephen Kelly [Tue, 9 Mar 2010 19:30:59 +0000 (20:30 +0100)]
Update benchmarks

7 years agoConvert Grantlee to a streaming API.
Stephen Kelly [Mon, 8 Mar 2010 02:37:13 +0000 (03:37 +0100)]
Convert Grantlee to a streaming API.

Side effects are that all escaping goes to the streaming class.
That means different escaping can be implemented for different
target markups.

7 years agoMake the benchmarks build again.
Stephen Kelly [Tue, 9 Mar 2010 00:00:19 +0000 (01:00 +0100)]
Make the benchmarks build again.

7 years agoSome minor cleanups
Stephen Kelly [Mon, 8 Mar 2010 02:19:57 +0000 (03:19 +0100)]
Some minor cleanups

7 years agoDon't abuse operator-> in SafeString. Use get() instead.
Stephen Kelly [Mon, 8 Mar 2010 02:17:50 +0000 (03:17 +0100)]
Don't abuse operator-> in SafeString. Use get() instead.

7 years agoMinor cleanup
Stephen Kelly [Mon, 8 Mar 2010 01:30:46 +0000 (02:30 +0100)]
Minor cleanup

7 years agoSimplify the filter API. Don't mimic the needsAutoescape property from DJango
Stephen Kelly [Mon, 8 Mar 2010 01:15:08 +0000 (02:15 +0100)]
Simplify the filter API. Don't mimic the needsAutoescape property from DJango

7 years agoMake the case more standard.
Stephen Kelly [Mon, 8 Mar 2010 01:08:10 +0000 (02:08 +0100)]
Make the case more standard.

7 years agoAdd a way to test the PluginPointer (needs valgrind)
Stephen Kelly [Fri, 5 Mar 2010 18:56:33 +0000 (19:56 +0100)]
Add a way to test the PluginPointer (needs valgrind)

7 years agoProvide a couple of more accessors on the PluginPointer.
Stephen Kelly [Fri, 5 Mar 2010 18:53:20 +0000 (19:53 +0100)]
Provide a couple of more accessors on the PluginPointer.

7 years agoMake sure the _Dummy class is not accessible.
Stephen Kelly [Fri, 5 Mar 2010 18:52:46 +0000 (19:52 +0100)]
Make sure the _Dummy class is not accessible.

7 years agoAdd media uri tracking to media_finder and Context
Stephen Kelly [Thu, 4 Mar 2010 18:56:24 +0000 (19:56 +0100)]
Add media uri tracking to media_finder and Context

7 years agoUse a managed pointer for handling plugins.
Stephen Kelly [Thu, 4 Mar 2010 18:07:12 +0000 (19:07 +0100)]
Use a managed pointer for handling plugins.

7 years agoFix build
Stephen Kelly [Thu, 4 Mar 2010 18:13:23 +0000 (19:13 +0100)]
Fix build

7 years agoChange the licence from LGPLv3 to LGPLv2+
Stephen Kelly [Wed, 3 Mar 2010 15:40:32 +0000 (16:40 +0100)]
Change the licence from LGPLv3 to LGPLv2+

This makes it legal to use it in GPLv2 libraries.

7 years agoFix the books example. Port to new API.
Stephen Kelly [Wed, 3 Mar 2010 14:52:25 +0000 (15:52 +0100)]
Fix the books example. Port to new API.

7 years agoRequire Qt 4.6. Needed to use QWeakPointer as a QObject tracker.
Stephen Kelly [Wed, 3 Mar 2010 16:18:01 +0000 (17:18 +0100)]
Require Qt 4.6. Needed to use QWeakPointer as a QObject tracker.

7 years agoMerge EngineState into Engine.
Stephen Kelly [Tue, 2 Mar 2010 01:22:37 +0000 (02:22 +0100)]
Merge EngineState into Engine.

If applications will want multiple engine states it makes more sense
for them to store engines than states.

This way Engine is not a singleton anymore which means that it needs
to be passed around more.

7 years agoAdd an interface for setting the Engine on the TagLibrary.
Stephen Kelly [Tue, 2 Mar 2010 01:16:55 +0000 (02:16 +0100)]
Add an interface for setting the Engine on the TagLibrary.

7 years agoUse QPluginLoader to manage plugin resources.
Stephen Kelly [Tue, 2 Mar 2010 00:53:38 +0000 (01:53 +0100)]
Use QPluginLoader to manage plugin resources.

QPluginLoader provides refcounted deletion through the unload() method.

7 years agoDon't give the scriptable libary extra special treatment.
Stephen Kelly [Tue, 2 Mar 2010 00:42:35 +0000 (01:42 +0100)]
Don't give the scriptable libary extra special treatment.

7 years agoRemove all unnecessary default constructors.
Stephen Kelly [Tue, 2 Mar 2010 01:32:32 +0000 (02:32 +0100)]
Remove all unnecessary default constructors.

7 years agoAdd a make docs target for doxygen and QtAssistant documentation generation.
Stephen Kelly [Sun, 28 Feb 2010 15:02:47 +0000 (16:02 +0100)]
Add a make docs target for doxygen and QtAssistant documentation generation.

7 years agoFix some minor Doxygen issues.
Stephen Kelly [Sun, 28 Feb 2010 14:58:50 +0000 (15:58 +0100)]
Fix some minor Doxygen issues.

7 years agoAdd a partially working cmake uninstall command
Stephen Kelly [Sun, 28 Feb 2010 14:02:07 +0000 (15:02 +0100)]
Add a partially working cmake uninstall command

7 years agoBuild the books example with DQT_NO_KEYWORDS
Stephen Kelly [Sun, 28 Feb 2010 16:12:40 +0000 (17:12 +0100)]
Build the books example with DQT_NO_KEYWORDS

7 years agoRemove _library suffix from the core library
Stephen Kelly [Sun, 28 Feb 2010 21:36:35 +0000 (22:36 +0100)]
Remove _library suffix from the core library

7 years agos/Grantlee_LIBRARIES/Granltee_CORE_LIBRARIES/g
Stephen Kelly [Sun, 28 Feb 2010 20:48:39 +0000 (21:48 +0100)]
s/Grantlee_LIBRARIES/Granltee_CORE_LIBRARIES/g

7 years agoMove grantlee.h to grantlee_core.h
Stephen Kelly [Sun, 28 Feb 2010 18:10:11 +0000 (19:10 +0100)]
Move grantlee.h to grantlee_core.h

7 years agos/GRANTLEE_EXPORT/GRANTLEE_CORE_EXPORT/g
Stephen Kelly [Sun, 28 Feb 2010 17:41:04 +0000 (18:41 +0100)]
s/GRANTLEE_EXPORT/GRANTLEE_CORE_EXPORT/g

7 years agoMove the taglibraryinterface out of a standalone directory.
Stephen Kelly [Sun, 28 Feb 2010 18:06:45 +0000 (19:06 +0100)]
Move the taglibraryinterface out of a standalone directory.

7 years agoAdd a slash in the plugin search path.
Stephen Kelly [Sun, 28 Feb 2010 19:21:22 +0000 (20:21 +0100)]
Add a slash in the plugin search path.

7 years agoFix the installed location of the GrantleeUse file.
Stephen Kelly [Sun, 28 Feb 2010 20:44:10 +0000 (21:44 +0100)]
Fix the installed location of the GrantleeUse file.

7 years agoRe-add strings file
Stephen Kelly [Sun, 28 Feb 2010 16:10:13 +0000 (17:10 +0100)]
Re-add strings file

7 years agoUpdate the grantlee_add_plugin macro to take specified TAGS and FILTERS
Stephen Kelly [Sun, 28 Feb 2010 13:51:53 +0000 (14:51 +0100)]
Update the grantlee_add_plugin macro to take specified TAGS and FILTERS

This silences moc warnings about filters not being QObjects.

7 years agoRemove the FindGrantlee.cmake file, now replaced by GrantleeConfig.
Stephen Kelly [Sat, 27 Feb 2010 14:54:38 +0000 (15:54 +0100)]
Remove the FindGrantlee.cmake file, now replaced by GrantleeConfig.

7 years agoMake it possible again to run tests in the build directory before installing.
Stephen Kelly [Sat, 27 Feb 2010 13:40:50 +0000 (14:40 +0100)]
Make it possible again to run tests in the build directory before installing.

7 years agoFix memory leak.
Stephen Kelly [Fri, 5 Feb 2010 19:30:43 +0000 (20:30 +0100)]
Fix memory leak.

7 years agoSmall improvements to compiler/build settings.
Marcus D. Hanwell [Fri, 26 Feb 2010 20:35:19 +0000 (21:35 +0100)]
Small improvements to compiler/build settings.

Check that the compiler is the GNU compiler before setting the C[XX]_FLAGS.

7 years agoAdd GrantleeConfig, Version and Use files.
Stephen Kelly [Sat, 20 Feb 2010 16:55:27 +0000 (17:55 +0100)]
Add GrantleeConfig, Version and Use files.

7 years agoUse the more common titlecase for Grantlee cmake variables.
Stephen Kelly [Sat, 20 Feb 2010 16:15:40 +0000 (17:15 +0100)]
Use the more common titlecase for Grantlee cmake variables.

7 years agoFix crash introduced by 9a18870b30d6349d6ea18e17c0b1193691b2b83d
Stephen Kelly [Sun, 14 Feb 2010 12:56:05 +0000 (13:56 +0100)]
Fix crash introduced by 9a18870b30d6349d6ea18e17c0b1193691b2b83d

The parent() of a node is not the template if the nodes are nested.

7 years agoFix some warning output from moc by not running it on non-qobject files.
Stephen Kelly [Sat, 6 Feb 2010 16:37:27 +0000 (17:37 +0100)]
Fix some warning output from moc by not running it on non-qobject files.

7 years agoUse the correct version string when creating the Qt resource file.
Stephen Kelly [Sat, 6 Feb 2010 16:21:02 +0000 (17:21 +0100)]
Use the correct version string when creating the Qt resource file.

7 years agoUse hidden visibility on gcc.
Stephen Kelly [Sat, 6 Feb 2010 16:20:37 +0000 (17:20 +0100)]
Use hidden visibility on gcc.

7 years agoInstall plugins to the correct location on windows.
Stephen Kelly [Sat, 6 Feb 2010 08:49:42 +0000 (09:49 +0100)]
Install plugins to the correct location on windows.

7 years agoDon't crash if a library can not be found.
Stephen Kelly [Sat, 6 Feb 2010 08:08:25 +0000 (09:08 +0100)]
Don't crash if a library can not be found.

It will be reported in error() later.

7 years agoLook for the correct mutable tags library.
Stephen Kelly [Sat, 6 Feb 2010 08:06:53 +0000 (09:06 +0100)]
Look for the correct mutable tags library.

7 years agoMake it possible to load plugins compiled with earlier versions of grantlee.
Stephen Kelly [Fri, 5 Feb 2010 21:14:24 +0000 (22:14 +0100)]
Make it possible to load plugins compiled with earlier versions of grantlee.

7 years agoEnsure that libraries loaded through templates are cached.
Stephen Kelly [Fri, 5 Feb 2010 20:56:17 +0000 (21:56 +0100)]
Ensure that libraries loaded through templates are cached.

7 years agoDon't allow loading the scriptable tags proxy library from templates.
Stephen Kelly [Fri, 5 Feb 2010 20:40:49 +0000 (21:40 +0100)]
Don't allow loading the scriptable tags proxy library from templates.

7 years agoRemove the "lib" prefix and "library" suffix from plugins.
Stephen Kelly [Fri, 5 Feb 2010 20:19:44 +0000 (21:19 +0100)]
Remove the "lib" prefix and "library" suffix from plugins.

Being explicit about this allows to remove platform specific code.

7 years agoDon't install test files to the build directory.
Stephen Kelly [Fri, 5 Feb 2010 18:53:12 +0000 (19:53 +0100)]
Don't install test files to the build directory.

Use the Qt Resource system as a virtual filesystem instead.

7 years agoDon't install libraries to the build directory and make tests use installed libraries.
Stephen Kelly [Fri, 5 Feb 2010 18:01:13 +0000 (19:01 +0100)]
Don't install libraries to the build directory and make tests use installed libraries.

7 years agoRemove the use of automoc and use cmake macros instead.
Stephen Kelly [Fri, 5 Feb 2010 17:29:37 +0000 (18:29 +0100)]
Remove the use of automoc and use cmake macros instead.

7 years agoFix build of examples.
Stephen Kelly [Wed, 3 Feb 2010 13:01:27 +0000 (14:01 +0100)]
Fix build of examples.

7 years agoChange SafeString to make the QString available through operator->().
Stephen Kelly [Tue, 2 Feb 2010 20:16:06 +0000 (21:16 +0100)]
Change SafeString to make the QString available through operator->().

Although it works on gcc, operator QVariant() is not preferred
over /* implicit */ QVariant(QString) on MSVC 2008, sun studio
and possibly others.

This derived-to-base behaviour is worked around by making SafeString
not a sub class of QString anymore. QString api is accessible through
operator->() and parts of it will be overridden later.

This includes a test file for testing the behaviour of different compilers
with different work arounds attempted.

7 years agoUse compiler flags on UNIX only.
Stephen Kelly [Tue, 2 Feb 2010 19:08:04 +0000 (20:08 +0100)]
Use compiler flags on UNIX only.

7 years agoDisable the export stuff on non-windows.
Stephen Kelly [Sun, 31 Jan 2010 08:21:08 +0000 (09:21 +0100)]
Disable the export stuff on non-windows.

7 years agoAdd missing explicits
Stephen Kelly [Sat, 30 Jan 2010 13:48:32 +0000 (14:48 +0100)]
Add missing explicits

7 years agoUse an ifdef to load plugins on windows which follow a different name pattern.
Stephen Kelly [Sun, 31 Jan 2010 07:48:38 +0000 (08:48 +0100)]
Use an ifdef to load plugins on windows which follow a different name pattern.

7 years agoRemove add_definitions which break things and are no longer needed.
Stephen Kelly [Sun, 31 Jan 2010 07:42:43 +0000 (08:42 +0100)]
Remove add_definitions which break things and are no longer needed.

http://lists.trolltech.com/qt-interest/2008-01/thread00095-0.html

7 years agoMake MSVC able to compile NodeList.
Stephen Kelly [Sun, 31 Jan 2010 07:41:54 +0000 (08:41 +0100)]
Make MSVC able to compile NodeList.

7 years agoUse || instead of "or".
Stephen Kelly [Sat, 30 Jan 2010 17:11:10 +0000 (18:11 +0100)]
Use || instead of "or".

Getting closer to compiling with MSVC.

7 years agoMake sure classes are exported as they need to be.
Stephen Kelly [Sat, 30 Jan 2010 17:10:36 +0000 (18:10 +0100)]
Make sure classes are exported as they need to be.

7 years agoForward declare Token properly as a struct.
Stephen Kelly [Sat, 30 Jan 2010 17:09:55 +0000 (18:09 +0100)]
Forward declare Token properly as a struct.

7 years agoSimplify the GRANTLEE_EXPORT macro now that I know why it exists.
Stephen Kelly [Sat, 30 Jan 2010 17:06:43 +0000 (18:06 +0100)]
Simplify the GRANTLEE_EXPORT macro now that I know why it exists.

Also use the correct defined symbol name as set in the target properties.
Now it can actually work.

7 years agoRemove duplication and suppress compiler warning.
Stephen Kelly [Sat, 30 Jan 2010 13:34:42 +0000 (14:34 +0100)]
Remove duplication and suppress compiler warning.

7 years agoMany whitespace fixes from astyle.
Stephen Kelly [Sat, 30 Jan 2010 13:22:10 +0000 (14:22 +0100)]
Many whitespace fixes from astyle.