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

diff --git a/karbon/karbon_view.h b/karbon/karbon_view.h
index 2e1e4dc0..5b572a85 100644
--- a/karbon/karbon_view.h
+++ b/karbon/karbon_view.h
@@ -32,7 +32,7 @@
 #include <KoUnit.h>
 #include <koffice_export.h>
 class DCOPObject;
-class QLabel;
+class TQLabel;
 
 class KAction;
 class KarbonPart;
@@ -74,9 +74,10 @@ class VCommand;
 class KARBONCOMMON_EXPORT KarbonView : public KoView, public KXMLGUIBuilder
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KarbonView( KarbonPart* part, QWidget* parent = 0L,
+	KarbonView( KarbonPart* part, TQWidget* tqparent = 0L,
 				const char* name = 0L );
 	virtual ~KarbonView();
 
@@ -84,13 +85,13 @@ public:
 
 	KarbonPart *part() const { return m_part; }
 
-	virtual void paintEverything( QPainter &p, const QRect &rect, bool transparent = false );
+	virtual void paintEverything( TQPainter &p, const TQRect &rect, bool transparent = false );
 
-	bool mouseEvent( QMouseEvent* event, const KoPoint & );
-	bool keyEvent( QEvent* event );
-	void dropEvent( QDropEvent *e );
+	bool mouseEvent( TQMouseEvent* event, const KoPoint & );
+	bool keyEvent( TQEvent* event );
+	void dropEvent( TQDropEvent *e );
 
-	virtual QWidget* canvas() const;
+	virtual TQWidget* canvas() const;
 
 	VCanvas* canvasWidget() const { return m_canvas; }
 
@@ -108,12 +109,12 @@ public:
 	void setNumberOfRecentFiles( unsigned int number );
 	void setLineWidth( double val );
 
-	QLabel* statusMessage() const { return m_status; }
+	TQLabel* statusMessage() const { return m_status; }
 
-	void setCursor( const QCursor & );
+	void setCursor( const TQCursor & );
 
-	void repaintAll( const KoRect & );
-	void repaintAll( bool = true );
+	void tqrepaintAll( const KoRect & );
+	void tqrepaintAll( bool = true );
 
 	void setPos( const KoPoint& p );
 
@@ -184,7 +185,7 @@ public slots:
 	bool showPageMargins();
 	void snapToGrid();
 
-	void showSelectionPopupMenu( const QPoint &pos );
+	void showSelectionPopupMenu( const TQPoint &pos );
 
 protected slots:
 	// Object related operations.
@@ -201,7 +202,7 @@ protected slots:
 	void canvasContentsMoving( int x, int y );
 	void commandExecuted( VCommand *command );
 	void strokeFillSelectionChanged( KDualColorButton::DualColor s );
-	void colorChanged( const QColor &c );
+	void colorChanged( const TQColor &c );
 signals:
 	void zoomChanged( double );
 	void selectionChange();
@@ -209,7 +210,7 @@ signals:
 
 protected:
 	virtual void updateReadWrite( bool ) {}
-	virtual void resizeEvent( QResizeEvent* event );
+	virtual void resizeEvent( TQResizeEvent* event );
 
 	void createDocumentTabDock();
 	void createLayersTabDock();
@@ -220,8 +221,8 @@ protected:
 	void createResourceDock();
 
 	//KXMLGUIBuilder
-	virtual QWidget *createContainer( QWidget *parent, int index, const QDomElement &element, int &id );
-	virtual void removeContainer( QWidget *container, QWidget *parent, QDomElement &element, int id );
+	virtual TQWidget *createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id );
+	virtual void removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id );
 	void addSelectionToClipboard() const;
 
 private:
@@ -273,9 +274,9 @@ private:
 	// dcop
 	DCOPObject		*m_dcop;
 
-	//Status Bar
-	QLabel				*m_status;       // Ordinary status
-	QLabel				*m_cursorCoords; // Cursor coordinates
+	//tqStatus Bar
+	TQLabel				*m_status;       // Ordinary status
+	TQLabel				*m_cursorCoords; // Cursor coordinates
 	VSmallPreview		*m_smallPreview; // Stroke and Fill
 	VToolController	*m_toolController;
 };