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

diff --git a/karbon/tools/vtexttool.h b/karbon/tools/vtexttool.h
index add0dd35..ccecb192 100644
--- a/karbon/tools/vtexttool.h
+++ b/karbon/tools/vtexttool.h
@@ -27,9 +27,9 @@
 
 #include <kdialogbase.h>
 
-#include "qframe.h"
-#include "qgroupbox.h"
-#include "qcombobox.h"
+#include "tqframe.h"
+#include "tqgroupbox.h"
+#include "tqcombobox.h"
 
 #include "vcommand.h"
 #include "vtext.h"
@@ -37,40 +37,42 @@
 
 class KFontCombo;
 class KIntNumInput;
-class QCheckBox;
-class QLineEdit;
-class QPushButton;
-class QTabWidget;
+class TQCheckBox;
+class TQLineEdit;
+class TQPushButton;
+class TQTabWidget;
 class ShadowWidget;
 class VTextTool;
-class QCursor;
+class TQCursor;
 
-class ShadowPreview : public QWidget
+class ShadowPreview : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ShadowPreview( ShadowWidget* parent );
+	ShadowPreview( ShadowWidget* tqparent );
 	~ShadowPreview();
 
 signals:
 	void changed( int angle, int distance, bool );
 
 protected:
-	virtual void mouseReleaseEvent( QMouseEvent* );
-	virtual void paintEvent( QPaintEvent* );
+	virtual void mouseReleaseEvent( TQMouseEvent* );
+	virtual void paintEvent( TQPaintEvent* );
 
 private:
 	ShadowWidget* m_parent;
 };
 
 
-class ShadowWidget : public QGroupBox
+class ShadowWidget : public TQGroupBox
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ShadowWidget( QWidget* parent, const char* name, int angle, int distance, bool translucent );
+	ShadowWidget( TQWidget* tqparent, const char* name, int angle, int distance, bool translucent );
 	~ShadowWidget();
 
 	void setUseShadow( bool use );
@@ -88,10 +90,10 @@ public slots:
 	void updatePreview();
 
 protected:
-	QCheckBox* m_useShadow;
+	TQCheckBox* m_useShadow;
 	KIntNumInput* m_angle;
 	KIntNumInput* m_distance;
-	QCheckBox* m_translucent;
+	TQCheckBox* m_translucent;
 	ShadowPreview* m_preview;
 };
 
@@ -99,19 +101,20 @@ protected:
 class VTextOptionsWidget : public KDialogBase
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	VTextOptionsWidget( VTextTool* tool, QWidget *parent );
+	VTextOptionsWidget( VTextTool* tool, TQWidget *tqparent );
 	~VTextOptionsWidget();
 
-	void setFont( const QFont& font );
-	QFont font();
-	void setText( const QString& text );
-	QString text();
+	void setFont( const TQFont& font );
+	TQFont font();
+	void setText( const TQString& text );
+	TQString text();
 	void setPosition( VText::Position position );
 	VText::Position position();
-	void setAlignment( VText::Alignment alignment );
-	VText::Alignment alignment();
+	void tqsetAlignment( VText::Alignment tqalignment );
+	VText::Alignment tqalignment();
 	void setOffset( double offset );
 	double offset();
 	void setUseShadow( bool state );
@@ -126,23 +129,23 @@ public slots:
 	void valueChanged( double );
 	void accept();
 	void cancel();
-	void textChanged( const QString& );
+	void textChanged( const TQString& );
 	void editBasePath();
 	void convertToShapes();
 	void initialize( VObject &text );
 
 protected:
-	QTabWidget* m_tabWidget;
+	TQTabWidget* m_tabWidget;
 	KFontCombo* m_fontCombo;
-	QCheckBox* m_boldCheck;
-	QCheckBox* m_italicCheck;
+	TQCheckBox* m_boldCheck;
+	TQCheckBox* m_italicCheck;
 	KIntNumInput* m_fontSize;
-	QLineEdit* m_textEditor;
+	TQLineEdit* m_textEditor;
 	ShadowWidget* m_shadow;
-	QComboBox* m_textAlignment;
-	QComboBox* m_textPosition;
-	QPushButton* m_editBasePath;
-	QPushButton* m_convertToShapes;
+	TQComboBox* m_textAlignment;
+	TQComboBox* m_textPosition;
+	TQPushButton* m_editBasePath;
+	TQPushButton* m_convertToShapes;
 	KDoubleNumInput* m_textOffset;
 	VTextTool* m_tool;
 };
@@ -155,9 +158,9 @@ public:
 	~VTextTool();
 
 	virtual void setup (KActionCollection *collection );
-	virtual QString uiname() { return i18n( "Text Tool" ); }
+	virtual TQString uiname() { return i18n( "Text Tool" ); }
 
-	virtual QString contextHelp();
+	virtual TQString contextHelp();
 	virtual bool showDialog() const;
 
 	virtual void activate();
@@ -196,9 +199,9 @@ private:
 	class VTextCmd : public VCommand
 	{
 	public:
-		VTextCmd( VDocument* doc, const QString& name, VText* text );
-		VTextCmd( VDocument* doc, const QString& name, VText* text,
-				  const QFont &newFont, const VSubpath& newBasePath, VText::Position newPosition, VText::Alignment newAlignment, double newOffset, const QString& newText,
+		VTextCmd( VDocument* doc, const TQString& name, VText* text );
+		VTextCmd( VDocument* doc, const TQString& name, VText* text,
+				  const TQFont &newFont, const VSubpath& newBasePath, VText::Position newPosition, VText::Alignment newAlignment, double newOffset, const TQString& newText,
 				  bool newUseShadow, int newShadowAngle, int newShadowDistance, bool newTranslucentShadow );
 		virtual ~VTextCmd();
 
@@ -217,8 +220,8 @@ private:
 			VTextModifPrivate() : oldBasePath( 0L ), newBasePath( 0L )
 			{}
 
-			QFont oldFont;
-			QFont newFont;
+			TQFont oldFont;
+			TQFont newFont;
 			VSubpath oldBasePath;
 			VSubpath newBasePath;
 			VText::Position oldPosition;
@@ -227,8 +230,8 @@ private:
 			VText::Alignment newAlignment;
 			double oldOffset;
 			double newOffset;
-			QString oldText;
-			QString newText;
+			TQString oldText;
+			TQString newText;
 			bool oldUseShadow;
 			bool newUseShadow;
 			int oldShadowAngle;
@@ -247,7 +250,7 @@ private:
 	class VTextToCompositeCmd : public VCommand
 	{
 	public:
-		VTextToCompositeCmd( VDocument* doc, const QString& name, VText* text );
+		VTextToCompositeCmd( VDocument* doc, const TQString& name, VText* text );
 		virtual ~VTextToCompositeCmd();
 
 		virtual void execute();
@@ -280,7 +283,7 @@ private:
 	bool m_creating;
 	// are we dragging in 45 degree steps?
 	bool m_stepwise;
-	QCursor* m_cursor;
+	TQCursor* m_cursor;
 };
 
 #endif