TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 15 insertions, 14 deletions

diff --git a/karbon/vtool.h b/karbon/vtool.h
index 6447225f..3eabbe76 100644
--- a/karbon/vtool.h
+++ b/karbon/vtool.h
@@ -20,7 +20,7 @@
 #ifndef __VTOOL_H__
 #define __VTOOL_H__
 
-#include <qobject.h>
+#include <tqobject.h>
 #include <kaction.h>
 #include <klocale.h>
 #include <KoPoint.h>
@@ -28,8 +28,8 @@
 class KRadioAction;
 class KarbonPart;
 class KarbonView;
-class QEvent;
-class QWidget;
+class TQEvent;
+class TQWidget;
 class VPainter;
 class VToolController;
 
@@ -37,7 +37,7 @@ enum enumToolType
 {
 	TOOL_SELECT = 0,       // 
 	TOOL_FREEHAND = 1,     //
-	TOOL_SHAPE = 2,        // Geometric shapes like ellipses and lines
+	TOOL_SHAPE = 2,        // Geometric tqshapes like ellipses and lines
 	TOOL_MANIPULATION = 3, //
 	TOOL_MISC = 4          //
 };
@@ -48,9 +48,10 @@ enum enumToolType
  * Each tool has an icon, name and category. Basic mouse event and key handling is
  * implemented here.
  */
-class KARBONBASE_EXPORT VTool : public QObject
+class KARBONBASE_EXPORT VTool : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	/**
@@ -89,12 +90,12 @@ public:
 	/**
 	 * The name of the tool.
 	 */
-	virtual QString uiname() { return i18n( "Unnamed Tool" ); }
+	virtual TQString uiname() { return i18n( "Unnamed Tool" ); }
 
 	/**
 	 * The context help of the tool.
 	 */
-	virtual QString contextHelp() { return i18n( "This tool has no description." ); }
+	virtual TQString contextHelp() { return i18n( "This tool has no description." ); }
 
 	/**
 	 * The tool type.
@@ -104,7 +105,7 @@ public:
 	/**
 	 * The tool status text.
 	 */
-	virtual QString statusText() { return ""; }
+	virtual TQString statusText() { return ""; }
 
 	/**
 	 * Position in toolbox. Zero means no preferred position, other
@@ -115,21 +116,21 @@ public:
 	/**
 	 * The tool icon name.
 	 */
-	QString icon() { return m_action->icon(); }
+	TQString icon() { return m_action->icon(); }
 
 	/**
 	 * This function processes every important mouse event.
 	 * It then calls suiting functions like mouseMoved() so deriving tools
 	 * don't need to directly deal with events themselves.
 	 */
-	bool mouseEvent( QMouseEvent* event, const KoPoint& );
+	bool mouseEvent( TQMouseEvent* event, const KoPoint& );
 
 	/**
 	 * This function processes every important key event.
 	 * It then calls suiting functions like mouseButtonPress() so deriving tools
 	 * don't need to directly deal with events themselves.
 	 */
-	bool keyEvent( QEvent* event );
+	bool keyEvent( TQEvent* event );
 
 	/**
 	 * This function is called when the documents unit setting were changed.
@@ -241,12 +242,12 @@ protected:
 	/**
 	 * "Arrow" key released up, down, left, right
 	 */
-	virtual void arrowKeyReleased( Qt::Key ) {}
+	virtual void arrowKeyReleased( TQt::Key ) {}
 
 	/**
 	 * Specified key released.
 	 */
-	virtual bool keyReleased( Qt::Key ) { return false; }
+	virtual bool keyReleased( TQt::Key ) { return false; }
 
 	/**
 	 * Cancels all tool operations. This event is invoked when ESC is pressed.
@@ -307,7 +308,7 @@ protected:
 	/** The tool's action object. */
 	KRadioAction *m_action;
 
-	/** Helper function. Returns the parent view's toolcontroller. */
+	/** Helper function. Returns the tqparent view's toolcontroller. */
 	VToolController *toolController() const;
 
 private: