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

diff --git a/kexi/plugins/forms/kexiformpart.h b/kexi/plugins/forms/kexiformpart.h
index 1ddbab53..df5c6b53 100644
--- a/kexi/plugins/forms/kexiformpart.h
+++ b/kexi/plugins/forms/kexiformpart.h
@@ -22,8 +22,8 @@
 #ifndef KEXIFORMPART_H
 #define KEXIFORMPART_H
 
-#include <qdom.h>
-#include <qcstring.h>
+#include <tqdom.h>
+#include <tqcstring.h>
 
 #include <kexi.h>
 #include <kexipart.h>
@@ -49,9 +49,10 @@ class KexiDataSourcePage;
 class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiFormPart(QObject *parent, const char *name, const QStringList &);
+		KexiFormPart(TQObject *tqparent, const char *name, const TQStringList &);
 		virtual ~KexiFormPart();
 
 		//! \return a pointer to Forms Widget Library.
@@ -59,33 +60,33 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part
 
 		KexiDataSourcePage* dataSourcePage() const;
 
-		void generateForm(KexiDB::FieldList *list, QDomDocument &domDoc);
+		void generateForm(KexiDB::FieldList *list, TQDomDocument &domDoc);
 
 		class TempData : public KexiDialogTempData
 		{
 			public:
-				TempData(QObject* parent);
+				TempData(TQObject* tqparent);
 				~TempData();
-				QGuardedPtr<KFormDesigner::Form> form;
-				QGuardedPtr<KFormDesigner::Form> previewForm;
-				QString tempForm;
-				QPoint scrollViewContentsPos; //!< to preserve contents pos after switching to other view
+				TQGuardedPtr<KFormDesigner::Form> form;
+				TQGuardedPtr<KFormDesigner::Form> previewForm;
+				TQString tempForm;
+				TQPoint scrollViewContentsPos; //!< to preserve contents pos after switching to other view
 				int resizeMode; //!< form's window's resize mode -one of KexiFormView::ResizeMode items
 				//! Used in KexiFormView::setUnsavedLocalBLOBs()
-				QMap<QWidget*, KexiBLOBBuffer::Id_t> unsavedLocalBLOBs;
+				TQMap<TQWidget*, KexiBLOBBuffer::Id_t> unsavedLocalBLOBs;
 				//! Used when loading a form from (temporary) XML in Data View 
 				//! to get unsaved blobs collected at design mode.
-				QMap<QCString, KexiBLOBBuffer::Id_t> unsavedLocalBLOBsByName;
+				TQMap<TQCString, KexiBLOBBuffer::Id_t> unsavedLocalBLOBsByName;
 		};
 
-		virtual QString i18nMessage(const QCString& englishMessage, 
+		virtual TQString i18nMessage(const TQCString& englishMessage, 
 			KexiDialogBase* dlg) const;
 
 	protected:
 		virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog);
 
-		virtual KexiViewBase* createView(QWidget *parent, KexiDialogBase* dialog,
-			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, QMap<QString,QString>* staticObjectArgs = 0);
+		virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog,
+			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
 		virtual void initPartActions();
 		virtual void initInstanceActions();
@@ -96,8 +97,8 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part
 	protected slots:
 		void slotAutoTabStopsSet(KFormDesigner::Form *form, bool set);
 		void slotAssignAction();
-		void slotPropertyChanged(QWidget *widget, const QCString &name, const QVariant &value);
-		void slotWidgetCreatedByFormsLibrary(QWidget* widget);
+		void slotPropertyChanged(TQWidget *widget, const TQCString &name, const TQVariant &value);
+		void slotWidgetCreatedByFormsLibrary(TQWidget* widget);
 
 	private:
 		class Private;