-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/101414/#review4158
-----------------------------------------------------------
Hi, please consider adding this patch to avoid infinite recursion. Needed at
least on g++ is (SUSE Linux) 4.5.0 20100604 [gcc-4_5-branch revision 160292].
diff --git a/libs/kundo2/kundo2stack.cpp b/libs/kundo2/kundo2stack.cpp
index 6af1d05..658df1f 100644
--- a/libs/kundo2/kundo2stack.cpp
+++ b/libs/kundo2/kundo2stack.cpp
@@ -1062,7 +1062,7 @@ bool KUndo2QStack::isActive() const
QAction* KUndo2QStack::createRedoAction(KActionCollection* actionCollection,
const QString& actionName)
{
- QAction* action = createRedoAction(actionCollection);
+ QAction* action =
createRedoAction(static_cast<QObject*>(actionCollection));
if(actionName.isEmpty()) {
action->setObjectName(KStandardAction::name(KStandardAction::Redo));
@@ -1081,7 +1081,7 @@ QAction*
KUndo2QStack::createRedoAction(KActionCollection* actionCollection, con
QAction* KUndo2QStack::createUndoAction(KActionCollection* actionCollection,
const QString& actionName)
{
- QAction* action = createUndoAction(actionCollection);
+ QAction* action =
createUndoAction(static_cast<QObject*>(actionCollection));
if(actionName.isEmpty()) {
action->setObjectName(KStandardAction::name(KStandardAction::Undo));
- Jarosław
On May 22, 2011, 12:17 p.m., Alexander Potashev wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/101414/
> -----------------------------------------------------------
>
> (Updated May 22, 2011, 12:17 p.m.)
>
>
> Review request for Calligra.
>
>
> Summary
> -------
>
> kundo2 is a fork of Qt's Undo Framework (QUndoStack, QUndoView, ...).
> It contains two bugfixes the are going to be available only in Qt 4.8:
> https://qt.gitorious.org/qt/qt/merge_requests/1212
> https://qt.gitorious.org/qt/qt/merge_requests/2610
>
> To start using kundo2, one should port Calligra to it. This can be done
> by adding target_link_libraries(... kundo2) into CMakeLists.txt files
> for all modules from Calligra that use Qt Undo Framework, and by
> switching from QUndo**** classes to KUndo2**** classes.
> (switching to KUndo2 classes can easily be done by using a script)
> Script for forward and backward porting:
> https://github.com/aspotashev/libkundo2/blob/master/port-kundo2.sh
>
> After Calligra starts requiring Qt 4.8+, this library can be removed,
> because it has no advantages over Qt's Undo Framework 4.8.
>
>
> Diffs
> -----
>
> libs/CMakeLists.txt 6179f0a
> libs/kundo2/CMakeLists.txt PRE-CREATION
> libs/kundo2/kundo2_export.h PRE-CREATION
> libs/kundo2/kundo2command.h PRE-CREATION
> libs/kundo2/kundo2group.h PRE-CREATION
> libs/kundo2/kundo2group.cpp PRE-CREATION
> libs/kundo2/kundo2model.h PRE-CREATION
> libs/kundo2/kundo2model.cpp PRE-CREATION
> libs/kundo2/kundo2qstack.h PRE-CREATION
> libs/kundo2/kundo2stack.h PRE-CREATION
> libs/kundo2/kundo2stack.cpp PRE-CREATION
> libs/kundo2/kundo2stack_p.h PRE-CREATION
> libs/kundo2/kundo2view.h PRE-CREATION
> libs/kundo2/kundo2view.cpp PRE-CREATION
>
> Diff: http://git.reviewboard.kde.org/r/101414/diff
>
>
> Testing
> -------
>
> It compiles.
>
>
> Thanks,
>
> Alexander
>
>
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
