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, 10 insertions, 9 deletions

diff --git a/kexi/widget/kexifieldcombobox.h b/kexi/widget/kexifieldcombobox.h
index 238168d21..9619f4073 100644
--- a/kexi/widget/kexifieldcombobox.h
+++ b/kexi/widget/kexifieldcombobox.h
@@ -20,7 +20,7 @@
 #ifndef KEXIFIELDCOMBOBOX_H
 #define KEXIFIELDCOMBOBOX_H
 
-#include <qpixmap.h>
+#include <tqpixmap.h>
 #include <kcombobox.h>
 
 namespace KexiDB {
@@ -34,9 +34,10 @@ class KexiProject;
 class KEXIEXTWIDGETS_EXPORT KexiFieldComboBox : public KComboBox
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiFieldComboBox(QWidget *parent, const char *name = 0);
+		KexiFieldComboBox(TQWidget *tqparent, const char *name = 0);
 		virtual ~KexiFieldComboBox();
 
 //		/*! Sets table or query schema \a schema. 
@@ -52,13 +53,13 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldComboBox : public KComboBox
 		//! Sets global project that is used to retrieve schema informationm for this combo box.
 		void setProject(KexiProject *prj);
 
-		void setTableOrQuery(const QString& name, bool table);
-		QString tableOrQueryName() const;
+		void setTableOrQuery(const TQString& name, bool table);
+		TQString tableOrQueryName() const;
 		bool isTableAssigned() const;
-		void setFieldOrExpression(const QString& string);
+		void setFieldOrExpression(const TQString& string);
 		void setFieldOrExpression(int index);
-		QString fieldOrExpression() const;
-		QString fieldOrExpressionCaption() const;
+		TQString fieldOrExpression() const;
+		TQString fieldOrExpressionCaption() const;
 
 		/*! \return index of selected table or query field.
 		 -1 is returned if there is nothing selected or expression is selected
@@ -70,10 +71,10 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldComboBox : public KComboBox
 
 	protected slots:
 		void slotActivated(int);
-		void slotReturnPressed(const QString & text);
+		void slotReturnPressed(const TQString & text);
 
 	protected:
-		virtual void focusOutEvent( QFocusEvent *e );
+		virtual void focusOutEvent( TQFocusEvent *e );
 
 		class Private;
 		Private *d;