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, 7 insertions, 7 deletions

diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h
index d5e45c30..d38ead75 100644
--- a/karbon/tools/vrectangletool.h
+++ b/karbon/tools/vrectangletool.h
@@ -24,10 +24,10 @@
 #include <klocale.h>
 #include <kdialogbase.h>
 
-#include "vshapetool.h"
+#include "vtqshapetool.h"
 
 class KarbonView;
-class QLabel;
+class TQLabel;
 class KoUnitDoubleSpinBox;
 
 class VRectangleTool : public VShapeTool
@@ -38,8 +38,8 @@ public:
 
 	virtual void setup(KActionCollection *collection);
 	virtual bool showDialog() const;
-	virtual QString uiname() { return i18n( "Rectangle Tool" ); }
-	virtual VPath* shape( bool interactive = false ) const;
+	virtual TQString uiname() { return i18n( "Rectangle Tool" ); }
+	virtual VPath* tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
@@ -47,7 +47,7 @@ private:
 	class VRectangleOptionsWidget : public KDialogBase
 	{
 	public:
-		VRectangleOptionsWidget( KarbonPart *part, QWidget* parent = 0L, const char* name = 0L );
+		VRectangleOptionsWidget( KarbonPart *part, TQWidget* tqparent = 0L, const char* name = 0L );
 
 		double width() const;
 		double height() const;
@@ -59,8 +59,8 @@ private:
 		KoUnitDoubleSpinBox		*m_width;
 		KoUnitDoubleSpinBox		*m_height;
 		KarbonPart 			*m_part;
-		QLabel				*m_heightLabel;
-		QLabel				*m_widthLabel;
+		TQLabel				*m_heightLabel;
+		TQLabel				*m_widthLabel;
 	};
 
 	VRectangleOptionsWidget *m_optionWidget;