TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 6 insertions, 4 deletions

diff --git a/kolourpaint/kpcommandhistory.h b/kolourpaint/kpcommandhistory.h
index c29d68fc..da415663 100644
--- a/kolourpaint/kpcommandhistory.h
+++ b/kolourpaint/kpcommandhistory.h
@@ -130,9 +130,10 @@ private:
 // Features not required by KolourPaint (e.g. commandExecuted()) are not
 // implemented and undo limit == redo limit.  So compared to
 // KCommandHistory, this is only "almost source compatible".
-class kpCommandHistoryBase : public QObject
+class kpCommandHistoryBase : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
     kpCommandHistoryBase (bool doReadConfig, KActionCollection *ac);
@@ -221,16 +222,16 @@ private:
 
 // Intercepts Undo/Redo requests:
 //
-// If the user is currently drawing a shape, it cancels it.
+// If the user is currently drawing a tqshape, it cancels it.
 // Else it passes on the Undo/Redo request to kpCommandHistoryBase.
 //
 // TODO: This is wrong.  It won't work if the Undo action is disabled,
 //       for instance.
 //
 //       Maybe the real solution is to call kpCommandHistoryBase::addCommand()
-//       as _soon_ as the shape starts - not after it ends.  But the
+//       as _soon_ as the tqshape starts - not after it ends.  But the
 //       trouble with this solution is that if the user Undoes/cancels
-//       the shape s/he's currently drawing, it would replace a Redo
+//       the tqshape s/he's currently drawing, it would replace a Redo
 //       slot in the history.  Arguably you shouldn't be able to Redo
 //       something you never finished drawing.
 //
@@ -238,6 +239,7 @@ private:
 class kpCommandHistory : public kpCommandHistoryBase
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
     kpCommandHistory (bool doReadConfig, kpMainWindow *mainWindow);