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

diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h
index da94d5be..f83e09ac 100644
--- a/karbon/karbon_part.h
+++ b/karbon/karbon_part.h
@@ -21,7 +21,7 @@
 #define __KARBON_PART_H__
 
 
-#include <qptrlist.h>
+#include <tqptrlist.h>
 
 #include <KoDocument.h>
 #include <KoUnit.h>
@@ -30,7 +30,7 @@
 
 class DCOPObject;
 class KoRect;
-class QRect;
+class TQRect;
 class VCommand;
 class VDocument;
 class VCommandHistory;
@@ -45,23 +45,24 @@ class VCommandHistory;
 class KARBONCOMMON_EXPORT KarbonPart : public KoDocument
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KarbonPart( QWidget* parentWidget = 0L, const char* widgetName = 0L,
-				QObject* parent = 0L, const char* name = 0L, bool singleViewMode = false );
+	KarbonPart( TQWidget* tqparentWidget = 0L, const char* widgetName = 0L,
+				TQObject* tqparent = 0L, const char* name = 0L, bool singleViewMode = false );
 	virtual ~KarbonPart();
 
-	virtual void paintContent( QPainter& painter, const QRect& rect,
+	virtual void paintContent( TQPainter& painter, const TQRect& rect,
 							   bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
 
 	/// standard koDocument inherited methods
-	virtual bool initDoc(InitDocFlags flags, QWidget* parentWidget=0);
+	virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
 
 	/// file-> open calls this method
-	virtual bool loadXML( QIODevice*, const QDomDocument& document );
-	virtual bool loadOasis( const QDomDocument &doc, KoOasisStyles &styles, const QDomDocument &settings, KoStore *store );
+	virtual bool loadXML( TQIODevice*, const TQDomDocument& document );
+	virtual bool loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQDomDocument &settings, KoStore *store );
 
 	/// file-> save and file-> save as call this method
-	virtual QDomDocument saveXML();
+	virtual TQDomDocument saveXML();
 	virtual bool saveOasis( KoStore *store, KoXmlWriter *manifestWriter );
 
 	virtual void addShell( KoMainWindow *shell );
@@ -72,7 +73,7 @@ public:
 	void insertObject( VObject* object );
 
 	/// insert a command into the undo/redo-history:
-	void addCommand( VCommand* cmd, bool repaint = false );
+	void addCommand( VCommand* cmd, bool tqrepaint = false );
 
 	// access static document:
 	VDocument& document() { return m_doc; }
@@ -101,23 +102,23 @@ public:
 	void initConfig();
 	unsigned int maxRecentFiles() const { return m_maxRecentFiles; }
 
-	void setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit );
+	void setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit );
 
-	bool mergeNativeFormat( const QString & file );
+	bool mergeNativeFormat( const TQString & file );
 
 public slots:
-	/// repaint all views attached to this koDocument
-	void repaintAllViews( bool repaint = true );
-	void repaintAllViews( const KoRect& );
+	/// tqrepaint all views attached to this koDocument
+	void tqrepaintAllViews( bool tqrepaint = true );
+	void tqrepaintAllViews( const KoRect& );
 	void slotDocumentRestored();
 	void slotCommandExecuted( VCommand * );
 	void slotUnitChanged( KoUnit::Unit unit );
 
 protected:
-	virtual KoView* createViewInstance( QWidget* parent, const char* name );
+	virtual KoView* createViewInstance( TQWidget* tqparent, const char* name );
 	virtual void removeView( KoView *view );
 	void saveOasisSettings( KoXmlWriter &/*settingsWriter*/ );
-	void loadOasisSettings( const QDomDocument&settingsDoc );
+	void loadOasisSettings( const TQDomDocument&settingsDoc );
 
 private:
 	VDocument m_doc;					/// store non-visual doc info