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

diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h
index 0a774556..e699afa1 100644
--- a/kexi/plugins/forms/kexiformview.h
+++ b/kexi/plugins/forms/kexiformview.h
@@ -21,7 +21,7 @@
 #ifndef KEXIFORMVIEW_H
 #define KEXIFORMVIEW_H
 
-#include <qtimer.h>
+#include <tqtimer.h>
 
 #include <kexiviewbase.h>
 #include <widget/kexidataawareview.h>
@@ -55,6 +55,7 @@ namespace KFormDesigner
 class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		enum ResizeMode {
@@ -64,14 +65,14 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 			NoResize = 2 /*! @todo */
 		};
 
-//		KexiFormView(KexiMainWindow *win, QWidget *parent, const char *name, KexiDB::Connection *conn);
-		KexiFormView(KexiMainWindow *mainWin, QWidget *parent, const char *name = 0,
+//		KexiFormView(KexiMainWindow *win, TQWidget *tqparent, const char *name, KexiDB::Connection *conn);
+		KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0,
 			bool dbAware = true);
 		virtual ~KexiFormView();
 
 //		KexiDB::Connection* connection() { return m_conn; }
 
-		virtual QSize preferredSizeHint(const QSize& otherSize);
+		virtual TQSize preferredSizeHint(const TQSize& otherSize);
 
 		int resizeMode() const { return m_resizeMode; }
 
@@ -89,7 +90,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		 Local BLOBs are retrieved KexiBLOBBuffer::self() and stored in "kexi__blobs" 'system' table.
 		 Note that db-aware BLOBs (non local) are not handled this way.
 		*/
-		void setUnsavedLocalBLOB(QWidget *widget, KexiBLOBBuffer::Id_t id);
+		void setUnsavedLocalBLOB(TQWidget *widget, KexiBLOBBuffer::Id_t id);
 
 	public slots:
 		/*! Reimplemented to update resize policy. */
@@ -102,27 +103,27 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		 so undo/redo is available for this operation.
 
 		 If multiple fields are provided, they will be aligned vertically.
-		 If \a pos is QPoint(-1,-1) (the default), position is computed automatically
+		 If \a pos is TQPoint(-1,-1) (the default), position is computed automatically
 		 based on a position last inserted field using this method. 
-		 If this method has not been called yet, position of QPoint(40, 40) will be set.
+		 If this method has not been called yet, position of TQPoint(40, 40) will be set.
 
 		 Called by:
 		 - slotHandleDropEvent() when field(s) are dropped from the data source pane onto the form
 		 - KexiFormManager is a used clicked "Insert fields" button on the data source pane. */
-		void insertAutoFields(const QString& sourceMimeType, const QString& sourceName,
-			const QStringList& fields, KFormDesigner::Container* targetContainerWidget, 
-			const QPoint& pos = QPoint(-1,-1));
+		void insertAutoFields(const TQString& sourceMimeType, const TQString& sourceName,
+			const TQStringList& fields, KFormDesigner::Container* targetContainerWidget, 
+			const TQPoint& pos = TQPoint(-1,-1));
 
 	protected slots:
 		void slotPropertySetSwitched(KoProperty::Set *b, bool forceReload = false, 
-			const QCString& propertyToSelect = QCString());
+			const TQCString& propertyToSelect = TQCString());
 		void slotDirty(KFormDesigner::Form *f, bool isDirty);
 		void slotFocus(bool in);
-		void slotHandleDragMoveEvent(QDragMoveEvent* e);
+		void slotHandleDragMoveEvent(TQDragMoveEvent* e);
 
 		//! Handles field(s) dropping from the data source pane onto the form
 		//! @see insertAutoFields()
-		void slotHandleDropEvent(QDropEvent* e);
+		void slotHandleDropEvent(TQDropEvent* e);
 
 //moved to formmanager		void slotWidgetSelected(KFormDesigner::Form *form, bool multiple);
 //moved to formmanager		void slotFormWidgetSelected(KFormDesigner::Form *form);
@@ -140,7 +141,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		virtual tristate storeData(bool dontAsk = false);
 
 		KexiFormPart::TempData* tempData() const {
-			return dynamic_cast<KexiFormPart::TempData*>(parentDialog()->tempData()); }
+			return dynamic_cast<KexiFormPart::TempData*>(tqparentDialog()->tempData()); }
 		KexiFormPart* formPart() const { return dynamic_cast<KexiFormPart*>(part()); }
 
 //moved to formmanager		void disableWidgetActions();
@@ -158,7 +159,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		//! Used in loadForm()
 		void updateValuesForSubproperties();
 
-		virtual void resizeEvent ( QResizeEvent * );
+		virtual void resizeEvent ( TQResizeEvent * );
 
 		void initDataSource();
 
@@ -195,7 +196,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		 It is shared between subsequent Data view sessions (just reopened on switch),
 		 but deleted and recreated from scratch when form's "dataSource" property changed
 		 since last form viewing (m_previousDataSourceString is used for that). */
-		QString m_previousDataSourceString;
+		TQString m_previousDataSourceString;
 
 		int m_resizeMode;
 
@@ -214,18 +215,18 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		int m_delayedFormContentsResizeOnShow;
 
 		//! Used in setFocusInternal()
-		QGuardedPtr<QWidget> m_setFocusInternalOnce;
+		TQGuardedPtr<TQWidget> m_setFocusInternalOnce;
 
 	
-		/*! Stores geometry of widget recently inserted using insertAutoFields() method.
+		/*! Stores tqgeometry of widget recently inserted using insertAutoFields() method.
 		 having this information, we'r eable to compute position for a newly 
 		 inserted widget in insertAutoFields() is such position has not been specified.
 		 (the position is specified when a widget is inserted with mouse drag & dropping
 		 but not with clicking of 'Insert fields' button from Data Source pane) */
-		QRect m_widgetGeometryForRecentInsertAutoFields;
+		TQRect m_widgetGeometryForRecentInsertAutoFields;
 
 		//! Used in setUnsavedLocalBLOBs()
-//		QMap<QWidget*, KexiBLOBBuffer::Id_t> m_unsavedLocalBLOBs;
+//		TQMap<TQWidget*, KexiBLOBBuffer::Id_t> m_unsavedLocalBLOBs;
 };
 
 #endif