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, 13 insertions, 12 deletions

diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h
index cee55da0..8d6212c4 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.h
+++ b/kexi/widget/tableview/kexidataawarepropertyset.h
@@ -20,11 +20,11 @@
 #ifndef KEXIDATAAWAREPROPERTYSET_H
 #define KEXIDATAAWAREPROPERTYSET_H
 
-#include <qguardedptr.h>
-#include <qptrvector.h>
+#include <tqguardedptr.h>
+#include <tqptrvector.h>
 #include <koproperty/set.h>
 
-typedef QPtrVector<KoProperty::Set> SetVector;
+typedef TQPtrVector<KoProperty::Set> SetVector;
 
 class KexiViewBase;
 class KexiTableItem;
@@ -50,9 +50,10 @@ class KexiDataAwareObjectInterface;
  - signalling via KexiViewBase::propertySetSwitched() that current property
    set has changed (e.g. on moving to other row)
 */
-class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public QObject
+class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		/*! You can instantiate KexiDataAwarePropertySet object
@@ -80,7 +81,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public QObject
 		/*! \return number of the first row containing \a propertyName property equal to \a value.
 		 This is used e.g. in the Table Designer to find a row by field name. 
 		 If no such row has been found, -1 is returned. */
-		int findRowForPropertyValue(const QCString& propertyName, const QVariant& value);
+		int findRowForPropertyValue(const TQCString& propertyName, const TQVariant& value);
 
 	signals:
 		/*! Emmited when row is deleted.
@@ -96,7 +97,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public QObject
 	public slots:
 		void removeCurrentPropertySet();
 
-		void clear(uint minimumSize = 0);
+		void clear(uint tqminimumSize = 0);
 
 		/*! Inserts \a set property set at \a row position.
 		 If there was a buffer at this position before, it will be destroyed.
@@ -106,7 +107,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public QObject
 		 The property set \a set will be owned by this object, so you should not
 		 delete this property set by hand but call removeCurrentPropertySet()
 		 or remove(uint) instead.
-		 Note that property set's parent (QObject::parent()) must be null
+		 Note that property set's tqparent (TQObject::tqparent()) must be null
 		 or qual to this KexiDataAwarePropertySet object, otherwise this method
 		 will fail with a warning.
 		*/
@@ -123,10 +124,10 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public QObject
 		void slotRowDeleted();
 
 		//! Called on multiple rows delete in a tableview.
-		void slotRowsDeleted( const QValueList<int> &rows );
+		void slotRowsDeleted( const TQValueList<int> &rows );
 
 		//! Called on \a row insertion in a tableview.
-		void slotRowInserted(KexiTableItem* item, uint row, bool repaint);
+		void slotRowInserted(KexiTableItem* item, uint row, bool tqrepaint);
 
 		//! Called on selecting another cell in a tableview.
 		void slotCellSelected(int, int row);
@@ -137,10 +138,10 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public QObject
 	protected:
 		SetVector m_sets; //!< prop. sets vector
 
-		QGuardedPtr<KexiViewBase> m_view;
+		TQGuardedPtr<KexiViewBase> m_view;
 		KexiDataAwareObjectInterface* m_dataObject;
-//		QGuardedPtr<KexiTableView> m_tableView;
-		QGuardedPtr<KexiTableViewData> m_currentTVData;
+//		TQGuardedPtr<KexiTableView> m_tableView;
+		TQGuardedPtr<KexiTableViewData> m_currentTVData;
 
 		int m_row; //!< used to know if a new row is selected in slotCellSelected()
 };