Usage of libkundo2 in Calligra (Qt's maximal dependency)

Alexander Potashev aspotashev at gmail.com
Fri May 13 18:23:10 BST 2011 

Hi,

I've recently "pushed through" a patch to Qt 4.8
(https://qt.gitorious.org/qt/qt/merge_requests/2610) that will allow
usage of different text in "Edit -> Undo %1"/"Redo %1" and "Undo
History" dockwidget. "Undo History" is only implemented in Krita.

But since this feature will only be available in Qt 4.8, and Calligra
will probably depend on it in a year, may be it's worth using a
replacement library to take advantage of the same feature without
waiting for new release of Qt?

How to use Qt 4.8's features without Qt 4.8: instead of QUndo* classes
(it's called Qt's Undo Framework,
http://doc.trolltech.com/4.7/qundo.html), the whole Calligra can use
my library libkundo2 (https://github.com/aspotashev/libkundo2) which
is a fork of Qt's Undo Framework.
In order to port Calligra to libkundo2, you should run the script
"forward-port.sh" from libkundo2 repository inside the calligra
sources' root directory. There is also a script for backward porting
-- "backward-port.sh". Running "forward-port" and then "backward-port"
will still give you a diff, because the format of #include-s is not
uniform throughout Calligra. See that diff in the attached file
"calligra-includes.diff".
Besides running the script, you should also link libkundo2's shared
library to those Calligra's libraries and applications that previously
used Qt's Undo Framework. You can find the patch doing this in the
attached file "0001-link-kundo2.patch".


Why we should use libkundo2 in the whole Calligra, not just in Krita:
Krita uses the class KoDocument that operates with QUndoStack. If we
switch Krita to libkundo2, we will have to also switch Calligra's core
libraries to it, and then the whole Calligra.

But before starting using libkundo2, we firstly need to add
dependencies on it to CMakeLists.txt files and probably move
libkundo2's source code to git.kde.org.


P.S. The second patch that has been merged to Qt 4.8 is
https://qt.gitorious.org/qt/qt/merge_requests/1212, libkundo2 also
fixes that bug.
P.P.S. I'm doing all this, because Russian translators had a few
discussions on how text of undoable commands should be translated to
fit both the "Edit -> Undo %1" commands and the "Undo History" panel
in Krita, Step and probably some other applications. There are some
workarounds possible to do in translations (for example, using a
colon, like "Undo: %1", to indicate that the text of the menu item is
expected not to be a complete word collocation), but they are not
perfect.


-- 
Alexander Potashev
-------------- next part --------------
diff --git a/braindump/src/Canvas.cpp b/braindump/src/Canvas.cpp
index d1c74c0..73aef1c 100644
--- a/braindump/src/Canvas.cpp
+++ b/braindump/src/Canvas.cpp
@@ -25,7 +25,7 @@
 
 #include <kxmlguifactory.h>
 #include <KAction>
-#include <kundostack.h>
+#include <KUndoStack>
 
 #include <KoCanvasController.h>
 #include <KoSelection.h>
diff --git a/braindump/src/DocumentModel.cpp b/braindump/src/DocumentModel.cpp
index 1354d25..a332200 100644
--- a/braindump/src/DocumentModel.cpp
+++ b/braindump/src/DocumentModel.cpp
@@ -21,7 +21,7 @@
 
 #include <QMimeData>
 
-#include <kundostack.h>
+#include <KUndoStack>
 
 #include <KoShapeRenameCommand.h>
 
diff --git a/braindump/src/MainWindow.cpp b/braindump/src/MainWindow.cpp
index 1774df0..6e1f006 100644
--- a/braindump/src/MainWindow.cpp
+++ b/braindump/src/MainWindow.cpp
@@ -32,7 +32,7 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kstandardaction.h>
-#include <kundostack.h>
+#include <KUndoStack>
 
 #include <KoDockFactoryBase.h>
 #include <KoCanvasObserverBase.h>
diff --git a/karbon/common/commands/KarbonBooleanCommand.h b/karbon/common/commands/KarbonBooleanCommand.h
index 28a16a7..9060777 100644
--- a/karbon/common/commands/KarbonBooleanCommand.h
+++ b/karbon/common/commands/KarbonBooleanCommand.h
@@ -21,7 +21,7 @@
 #define _KARBONBOOLEANCOMMAND_H_
 
 #include <karboncommon_export.h>
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KoShapeControllerBase;
 class KoPathShape;
diff --git a/karbon/plugins/flattenpath/KarbonPathFlattenCommand.h b/karbon/plugins/flattenpath/KarbonPathFlattenCommand.h
index a64da55..2a6b937 100644
--- a/karbon/plugins/flattenpath/KarbonPathFlattenCommand.h
+++ b/karbon/plugins/flattenpath/KarbonPathFlattenCommand.h
@@ -20,7 +20,7 @@
 #ifndef _KARBONPATHFLATTENCOMMAND_H_
 #define _KARBONPATHFLATTENCOMMAND_H_
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KoPathShape;
 
diff --git a/karbon/plugins/refinepath/KarbonPathRefineCommand.h b/karbon/plugins/refinepath/KarbonPathRefineCommand.h
index 178019c..36e1ffa 100644
--- a/karbon/plugins/refinepath/KarbonPathRefineCommand.h
+++ b/karbon/plugins/refinepath/KarbonPathRefineCommand.h
@@ -20,7 +20,7 @@
 #ifndef _KARBONPATHREFINECOMMAND_H_
 #define _KARBONPATHREFINECOMMAND_H_
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KoPathShape;
 
diff --git a/karbon/plugins/roundcorners/RoundCornersCommand.h b/karbon/plugins/roundcorners/RoundCornersCommand.h
index bd3d5b4..51ddbb9 100644
--- a/karbon/plugins/roundcorners/RoundCornersCommand.h
+++ b/karbon/plugins/roundcorners/RoundCornersCommand.h
@@ -20,7 +20,7 @@
 #ifndef ROUNDCORNERSCOMMAND_H
 #define ROUNDCORNERSCOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include <QtCore/QPointF>
 
 class KoPathShape;
diff --git a/karbon/plugins/roundcorners/RoundCornersPlugin.h b/karbon/plugins/roundcorners/RoundCornersPlugin.h
index 1bc0828..0d9be34 100644
--- a/karbon/plugins/roundcorners/RoundCornersPlugin.h
+++ b/karbon/plugins/roundcorners/RoundCornersPlugin.h
@@ -30,7 +30,7 @@
 #include <kdialog.h>
 #include <QVariantList>
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KarbonView;
 class RoundCornersDlg;
diff --git a/karbon/plugins/tools/KarbonPatternTool.cpp b/karbon/plugins/tools/KarbonPatternTool.cpp
index 51e57dd..dd21a05 100644
--- a/karbon/plugins/tools/KarbonPatternTool.cpp
+++ b/karbon/plugins/tools/KarbonPatternTool.cpp
@@ -41,7 +41,7 @@
 
 #include <QtGui/QPainter>
 #include <QtGui/QWidget>
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 KarbonPatternTool::KarbonPatternTool(KoCanvasBase *canvas)
         : KoToolBase(canvas), m_currentStrategy(0), m_optionsWidget(0)
diff --git a/karbon/plugins/tools/filterEffectTool/FilterAddCommand.h b/karbon/plugins/tools/filterEffectTool/FilterAddCommand.h
index 9c17074..e22a7bf 100644
--- a/karbon/plugins/tools/filterEffectTool/FilterAddCommand.h
+++ b/karbon/plugins/tools/filterEffectTool/FilterAddCommand.h
@@ -20,7 +20,7 @@
 #ifndef FILTERADDCOMMAND_H
 #define FILTERADDCOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KoShape;
 class KoFilterEffect;
diff --git a/karbon/plugins/tools/filterEffectTool/FilterInputChangeCommand.h b/karbon/plugins/tools/filterEffectTool/FilterInputChangeCommand.h
index b5aa625..2485ff3 100644
--- a/karbon/plugins/tools/filterEffectTool/FilterInputChangeCommand.h
+++ b/karbon/plugins/tools/filterEffectTool/FilterInputChangeCommand.h
@@ -20,7 +20,7 @@
 #ifndef FILTERINPUTCHANGECOMMAND_H
 #define FILTERINPUTCHANGECOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KoShape;
 class KoFilterEffect;
diff --git a/karbon/plugins/tools/filterEffectTool/FilterRegionChangeCommand.h b/karbon/plugins/tools/filterEffectTool/FilterRegionChangeCommand.h
index 1d448df..ba432f5 100644
--- a/karbon/plugins/tools/filterEffectTool/FilterRegionChangeCommand.h
+++ b/karbon/plugins/tools/filterEffectTool/FilterRegionChangeCommand.h
@@ -20,7 +20,7 @@
 #ifndef FILTERREGIONCHANGECOMMAND_H
 #define FILTERREGIONCHANGECOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include <QtCore/QRectF>
 
 class KoShape;
diff --git a/karbon/plugins/tools/filterEffectTool/FilterRemoveCommand.h b/karbon/plugins/tools/filterEffectTool/FilterRemoveCommand.h
index f926f0e..3525451 100644
--- a/karbon/plugins/tools/filterEffectTool/FilterRemoveCommand.h
+++ b/karbon/plugins/tools/filterEffectTool/FilterRemoveCommand.h
@@ -20,7 +20,7 @@
 #ifndef FILTERREMOVECOMMAND_H
 #define FILTERREMOVECOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KoShape;
 class KoFilterEffect;
diff --git a/karbon/plugins/tools/filterEffectTool/FilterStackSetCommand.h b/karbon/plugins/tools/filterEffectTool/FilterStackSetCommand.h
index 58f9d4e..bd7fab1 100644
--- a/karbon/plugins/tools/filterEffectTool/FilterStackSetCommand.h
+++ b/karbon/plugins/tools/filterEffectTool/FilterStackSetCommand.h
@@ -20,7 +20,7 @@
 #ifndef FILTERSTACKSETCOMMAND_H
 #define FILTERSTACKSETCOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KoFilterEffectStack;
 class KoShape;
diff --git a/karbon/plugins/whirlpinch/KarbonWhirlPinchCommand.h b/karbon/plugins/whirlpinch/KarbonWhirlPinchCommand.h
index ae361d9..5fe7990 100644
--- a/karbon/plugins/whirlpinch/KarbonWhirlPinchCommand.h
+++ b/karbon/plugins/whirlpinch/KarbonWhirlPinchCommand.h
@@ -20,7 +20,7 @@
 #ifndef KARBONWHIRLPINCHCOMMAND_H
 #define KARBONWHIRLPINCHCOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KoPathShape;
 
diff --git a/karbon/ui/KarbonDocumentMergeCommand.h b/karbon/ui/KarbonDocumentMergeCommand.h
index 4d97376..72da692 100644
--- a/karbon/ui/KarbonDocumentMergeCommand.h
+++ b/karbon/ui/KarbonDocumentMergeCommand.h
@@ -20,7 +20,7 @@
 #ifndef _KARBONDOCUMENTMERGECOMMAND_H_
 #define _KARBONDOCUMENTMERGECOMMAND_H_
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KarbonPart;
 
diff --git a/krita/plugins/extensions/dockers/historydocker/HistoryDock.h b/krita/plugins/extensions/dockers/historydocker/HistoryDock.h
index 50a5ecc..4985d99 100644
--- a/krita/plugins/extensions/dockers/historydocker/HistoryDock.h
+++ b/krita/plugins/extensions/dockers/historydocker/HistoryDock.h
@@ -24,7 +24,7 @@
 
 #include <KoCanvasObserverBase.h>
 #include <klocale.h>
-#include <kundostack.h>
+#include <KUndoStack>
 
 #include <KoShapeController.h>
 #include <KoCanvasBase.h>
diff --git a/krita/plugins/extensions/dockers/historydocker/KisUndoView.cpp b/krita/plugins/extensions/dockers/historydocker/KisUndoView.cpp
index 2337821..e55b084 100644
--- a/krita/plugins/extensions/dockers/historydocker/KisUndoView.cpp
+++ b/krita/plugins/extensions/dockers/historydocker/KisUndoView.cpp
@@ -56,13 +56,13 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qundostack.h"
+#include <QUndoStack>
 #include "KisUndoView.h"
 #include "KisUndoModel.h"
 
 #ifndef QT_NO_UNDOVIEW
 
-#include "qundogroup.h"
+#include <QUndoGroup>
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qpointer.h>
 #include <QtGui/qicon.h>
diff --git a/krita/ui/dialogs/kis_dlg_preferences.cc b/krita/ui/dialogs/kis_dlg_preferences.cc
index 109d1b6..ec4b4d1 100644
--- a/krita/ui/dialogs/kis_dlg_preferences.cc
+++ b/krita/ui/dialogs/kis_dlg_preferences.cc
@@ -53,7 +53,7 @@
 #include <kpagewidgetmodel.h>
 #include <kicon.h>
 #include <kvbox.h>
-#include <kundostack.h>
+#include <KUndoStack>
 
 #include "widgets/squeezedcombobox.h"
 #include "kis_clipboard.h"
diff --git a/libs/flake/commands/KoConnectionShapeTypeCommand.h b/libs/flake/commands/KoConnectionShapeTypeCommand.h
index 8fc51c4..806ae44 100644
--- a/libs/flake/commands/KoConnectionShapeTypeCommand.h
+++ b/libs/flake/commands/KoConnectionShapeTypeCommand.h
@@ -21,7 +21,7 @@
 #define KoConnectionShapeTypeCommand_H
 
 #include "KoConnectionShape.h"
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 /// The undo / redo command for configuring an KoConnection shape
 class KoConnectionShapeTypeCommand : public QUndoCommand
diff --git a/libs/flake/commands/KoShapeTransformCommand.h b/libs/flake/commands/KoShapeTransformCommand.h
index 36ba0cc..00d79e0 100644
--- a/libs/flake/commands/KoShapeTransformCommand.h
+++ b/libs/flake/commands/KoShapeTransformCommand.h
@@ -22,7 +22,7 @@
 #define KOSHAPETRANSFORMCOMMAND_H
 
 #include "flake_export.h"
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class KoShape;
 class QTransform;
diff --git a/libs/flake/tests/TestShapeGroupCommand.cpp b/libs/flake/tests/TestShapeGroupCommand.cpp
index 0427cce..f724d7d 100644
--- a/libs/flake/tests/TestShapeGroupCommand.cpp
+++ b/libs/flake/tests/TestShapeGroupCommand.cpp
@@ -23,7 +23,7 @@
 #include <KoShapeGroupCommand.h>
 #include <KoLineBorder.h>
 #include <KoShapeShadow.h>
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 TestShapeGroupCommand::TestShapeGroupCommand()
         : toplevelGroup(0), sublevelGroup(0), strokeGroup(0)
diff --git a/libs/main/KoUndoStackAction.cpp b/libs/main/KoUndoStackAction.cpp
index 1550c71..a45b97c 100644
--- a/libs/main/KoUndoStackAction.cpp
+++ b/libs/main/KoUndoStackAction.cpp
@@ -20,7 +20,7 @@
 
 #include "KoUndoStackAction.h"
 
-#include <kundostack.h>
+#include <KUndoStack>
 #include <klocale.h>
 #include <kstandardshortcut.h>
 
diff --git a/plugins/artistictextshape/AddTextRangeCommand.h b/plugins/artistictextshape/AddTextRangeCommand.h
index 41598cc..0746aa0 100644
--- a/plugins/artistictextshape/AddTextRangeCommand.h
+++ b/plugins/artistictextshape/AddTextRangeCommand.h
@@ -21,7 +21,7 @@
 #ifndef ADDTEXTRANGECOMMAND_H 
 #define ADDTEXTRANGECOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include "ArtisticTextTool.h"
 #include "ArtisticTextRange.h"
 #include <QtCore/QPointer>
diff --git a/plugins/artistictextshape/ArtisticTextTool.cpp b/plugins/artistictextshape/ArtisticTextTool.cpp
index 68debef..d8169f8 100644
--- a/plugins/artistictextshape/ArtisticTextTool.cpp
+++ b/plugins/artistictextshape/ArtisticTextTool.cpp
@@ -48,7 +48,7 @@
 #include <QtGui/QCheckBox>
 #include <QtGui/QPainter>
 #include <QtGui/QPainterPath>
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 #include <float.h>
 
diff --git a/plugins/artistictextshape/AttachTextToPathCommand.h b/plugins/artistictextshape/AttachTextToPathCommand.h
index 7094c24..757d209 100644
--- a/plugins/artistictextshape/AttachTextToPathCommand.h
+++ b/plugins/artistictextshape/AttachTextToPathCommand.h
@@ -20,7 +20,7 @@
 #ifndef ATTACHTEXTTOPATHCOMMAND_H
 #define ATTACHTEXTTOPATHCOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include <QtGui/QTransform>
 
 class ArtisticTextShape;
diff --git a/plugins/artistictextshape/ChangeTextAnchorCommand.h b/plugins/artistictextshape/ChangeTextAnchorCommand.h
index 9c521b9..6b1edd1 100644
--- a/plugins/artistictextshape/ChangeTextAnchorCommand.h
+++ b/plugins/artistictextshape/ChangeTextAnchorCommand.h
@@ -22,7 +22,7 @@
 #define CHANGETEXTANCHORCOMMAND_H
 
 #include "ArtisticTextShape.h"
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class ChangeTextAnchorCommand : public QUndoCommand
 {
diff --git a/plugins/artistictextshape/ChangeTextFontCommand.h b/plugins/artistictextshape/ChangeTextFontCommand.h
index 1326a48..76f514c 100644
--- a/plugins/artistictextshape/ChangeTextFontCommand.h
+++ b/plugins/artistictextshape/ChangeTextFontCommand.h
@@ -22,7 +22,7 @@
 #define CHANGETEXTFONTCOMMAND_H
 
 #include "ArtisticTextRange.h"
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include <QtGui/QFont>
 
 class ArtisticTextShape;
diff --git a/plugins/artistictextshape/ChangeTextOffsetCommand.h b/plugins/artistictextshape/ChangeTextOffsetCommand.h
index 00b90f0..b7c0f7a 100644
--- a/plugins/artistictextshape/ChangeTextOffsetCommand.h
+++ b/plugins/artistictextshape/ChangeTextOffsetCommand.h
@@ -20,7 +20,7 @@
 #ifndef CHANGETEXTOFFSETCOMMAND_H
 #define CHANGETEXTOFFSETCOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class ArtisticTextShape;
 
diff --git a/plugins/artistictextshape/DetachTextFromPathCommand.h b/plugins/artistictextshape/DetachTextFromPathCommand.h
index c80fe6a..c76b882 100644
--- a/plugins/artistictextshape/DetachTextFromPathCommand.h
+++ b/plugins/artistictextshape/DetachTextFromPathCommand.h
@@ -20,7 +20,7 @@
 #ifndef DETACHTEXTFROMPATHCOMMAND_H
 #define DETACHTEXTFROMPATHCOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include <QtGui/QPainterPath>
 
 class ArtisticTextShape;
diff --git a/plugins/artistictextshape/RemoveTextRangeCommand.h b/plugins/artistictextshape/RemoveTextRangeCommand.h
index 565f54f..03ebfeb 100644
--- a/plugins/artistictextshape/RemoveTextRangeCommand.h
+++ b/plugins/artistictextshape/RemoveTextRangeCommand.h
@@ -21,7 +21,7 @@
 #ifndef REMOVETEXTRANGECOMMAND_H
 #define REMOVETEXTRANGECOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include <QtCore/QPointer>
 #include "ArtisticTextTool.h"
 
diff --git a/plugins/defaultTools/connectionTool/AddConnectionPointCommand.h b/plugins/defaultTools/connectionTool/AddConnectionPointCommand.h
index 19e4f46..80f3760 100644
--- a/plugins/defaultTools/connectionTool/AddConnectionPointCommand.h
+++ b/plugins/defaultTools/connectionTool/AddConnectionPointCommand.h
@@ -21,7 +21,7 @@
 #ifndef ADDCONNECTIONPOINTCOMMAND_H
 #define ADDCONNECTIONPOINTCOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include <QtCore/QPointF>
 
 class KoShape;
diff --git a/plugins/defaultTools/connectionTool/ChangeConnectionPointCommand.h b/plugins/defaultTools/connectionTool/ChangeConnectionPointCommand.h
index bc874bc..147cb26 100644
--- a/plugins/defaultTools/connectionTool/ChangeConnectionPointCommand.h
+++ b/plugins/defaultTools/connectionTool/ChangeConnectionPointCommand.h
@@ -22,7 +22,7 @@
 #define CHANGECONNECTIONPOINTCOMMAND_H
 
 #include <KoConnectionPoint.h>
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include <QtCore/QPointF>
 
 class KoShape;
diff --git a/plugins/defaultTools/connectionTool/RemoveConnectionPointCommand.h b/plugins/defaultTools/connectionTool/RemoveConnectionPointCommand.h
index 428cc51..e514383 100644
--- a/plugins/defaultTools/connectionTool/RemoveConnectionPointCommand.h
+++ b/plugins/defaultTools/connectionTool/RemoveConnectionPointCommand.h
@@ -22,7 +22,7 @@
 #define REMOVECONNECTIONPOINTCOMMAND_H
 
 #include <KoConnectionPoint.h>
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include <QtCore/QPointF>
 
 class KoShape;
diff --git a/plugins/defaultTools/defaulttool/SelectionTransformCommand.h b/plugins/defaultTools/defaulttool/SelectionTransformCommand.h
index 0a8bb0a..ada6777 100644
--- a/plugins/defaultTools/defaulttool/SelectionTransformCommand.h
+++ b/plugins/defaultTools/defaulttool/SelectionTransformCommand.h
@@ -20,7 +20,7 @@
 #ifndef SELECTION_TRANSFORM_COMMAND_H
 #define SELECTION_TRANSFORM_COMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 #include <QtGui/QTransform>
 
 class KoSelection;
diff --git a/plugins/pathshapes/ellipse/EllipseShapeConfigCommand.h b/plugins/pathshapes/ellipse/EllipseShapeConfigCommand.h
index d3f2584..2319423 100644
--- a/plugins/pathshapes/ellipse/EllipseShapeConfigCommand.h
+++ b/plugins/pathshapes/ellipse/EllipseShapeConfigCommand.h
@@ -21,7 +21,7 @@
 #define ELLIPSESHAPECONFIGCOMMAND_H
 
 #include "EllipseShape.h"
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 /// The undo / redo command for configuring an ellipse shape
 class EllipseShapeConfigCommand : public QUndoCommand
diff --git a/plugins/pathshapes/rectangle/RectangleShapeConfigCommand.h b/plugins/pathshapes/rectangle/RectangleShapeConfigCommand.h
index bd2883f..2b41601 100644
--- a/plugins/pathshapes/rectangle/RectangleShapeConfigCommand.h
+++ b/plugins/pathshapes/rectangle/RectangleShapeConfigCommand.h
@@ -20,7 +20,7 @@
 #ifndef RECTANGLESHAPECONFIGCOMMAND_H
 #define RECTANGLESHAPECONFIGCOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class RectangleShape;
 
diff --git a/plugins/pathshapes/spiral/SpiralShapeConfigCommand.h b/plugins/pathshapes/spiral/SpiralShapeConfigCommand.h
index 590b699..d6b8513 100644
--- a/plugins/pathshapes/spiral/SpiralShapeConfigCommand.h
+++ b/plugins/pathshapes/spiral/SpiralShapeConfigCommand.h
@@ -21,7 +21,7 @@
 #define SPIRALSHAPECONFIGCOMMAND_H
 
 #include "SpiralShape.h"
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 /// The undo / redo command for configuring a spiral shape
 class SpiralShapeConfigCommand : public QUndoCommand
diff --git a/plugins/pathshapes/star/StarShapeConfigCommand.h b/plugins/pathshapes/star/StarShapeConfigCommand.h
index 77c8237..2334fd1 100644
--- a/plugins/pathshapes/star/StarShapeConfigCommand.h
+++ b/plugins/pathshapes/star/StarShapeConfigCommand.h
@@ -20,7 +20,7 @@
 #ifndef STARSHAPECONFIGCOMMAND_H
 #define STARSHAPECONFIGCOMMAND_H
 
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 class StarShape;
 
diff --git a/plugins/treeshape/TreeChangeConnectionCommand.h b/plugins/treeshape/TreeChangeConnectionCommand.h
index dc18b52..b04a098 100644
--- a/plugins/treeshape/TreeChangeConnectionCommand.h
+++ b/plugins/treeshape/TreeChangeConnectionCommand.h
@@ -22,7 +22,7 @@
 #define TREECHANGECONNECTIONCOMMAND_H
 
 #include "TreeShape.h"
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 /// The undo / redo command for configuring a connections between root and children
 class TreeChangeConnectionCommand : public QUndoCommand
diff --git a/plugins/treeshape/TreeChangeStructureCommand.h b/plugins/treeshape/TreeChangeStructureCommand.h
index 60961d8..407a6ab 100644
--- a/plugins/treeshape/TreeChangeStructureCommand.h
+++ b/plugins/treeshape/TreeChangeStructureCommand.h
@@ -22,7 +22,7 @@
 #define TREECHANGESTRUCTURECOMMAND_H
 
 #include "TreeShape.h"
-#include <QtGui/QUndoCommand>
+#include <QUndoCommand>
 
 /// The undo / redo command for configuring a a tree shape
 class TreeChangeStructureCommand : public QUndoCommand
diff --git a/tools/koabstraction/KoAbstractApplicationController.cpp b/tools/koabstraction/KoAbstractApplicationController.cpp
index 26c3c62..f8a91ea 100644
--- a/tools/koabstraction/KoAbstractApplicationController.cpp
+++ b/tools/koabstraction/KoAbstractApplicationController.cpp
@@ -60,7 +60,7 @@
 #include <kparts/part.h>
 #include <kparts/componentfactory.h>
 #include <kparts/event.h>
-#include <kundostack.h>
+#include <KUndoStack>
 #include <kmimetypetrader.h>
 
 #include <QApplication>
diff --git a/tools/mobile/ApplicationController.cpp b/tools/mobile/ApplicationController.cpp
index 647d6bb..a67565e 100644
--- a/tools/mobile/ApplicationController.cpp
+++ b/tools/mobile/ApplicationController.cpp
@@ -119,7 +119,7 @@
 #include <styles/KoParagraphStyle.h>
 #include <styles/KoListLevelProperties.h>
 #include <KoList.h>
-#include <kundostack.h>
+#include <KUndoStack>
 #include <tables/Map.h>
 #include <tables/DocBase.h>
 #include <tables/part/View.h>
diff --git a/tools/mobile/MainWindow.cpp b/tools/mobile/MainWindow.cpp
index 9e6c6c5..e8bc634 100644
--- a/tools/mobile/MainWindow.cpp
+++ b/tools/mobile/MainWindow.cpp
@@ -118,7 +118,7 @@
 #include <styles/KoParagraphStyle.h>
 #include <styles/KoListLevelProperties.h>
 #include <KoList.h>
-#include <kundostack.h>
+#include <KUndoStack>
 #include <tables/Map.h>
 #include <tables/DocBase.h>
 #include <tables/part/View.h>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-link-kundo2.patch
Type: text/x-patch
Size: 26334 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20110513/c2a4efcf/attachment.bin>

More information about the calligra-devel mailing list