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

diff --git a/kexi/widget/kexidatasourcecombobox.h b/kexi/widget/kexidatasourcecombobox.h
index 01a02d03..6f9f58ed 100644
--- a/kexi/widget/kexidatasourcecombobox.h
+++ b/kexi/widget/kexidatasourcecombobox.h
@@ -34,9 +34,10 @@ namespace KexiPart {
 class KEXIEXTWIDGETS_EXPORT KexiDataSourceComboBox : public KComboBox
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiDataSourceComboBox(QWidget *parent, const char *name=0);
+		KexiDataSourceComboBox(TQWidget *tqparent, const char *name=0);
 		~KexiDataSourceComboBox();
 
 		//! \return global project that is used to retrieve schema informationm for this combo box.
@@ -44,18 +45,18 @@ class KEXIEXTWIDGETS_EXPORT KexiDataSourceComboBox : public KComboBox
 
 		//! \return name of selected table or query. Can return null string.
 		//! You should use isSelectionValid() to check validity of the input.
-		QString selectedMimeType() const;
+		TQString selectedMimeType() const;
 
 		//! \return name of selected table or query. Can return null string or nonexisting name,
 		//! so you should use isSelectionValid() to check validity of the input.
-		QString selectedName() const;
+		TQString selectedName() const;
 
 		//! \return true if current selection is valid
 		bool isSelectionValid() const;
 
 		/*! \return index of item of mime type \a mimeType and name \a name.
 		 Returs -1 of no such item exists. */
-		int findItem(const QString& mimeType, const QString& name);
+		int findItem(const TQString& mimeType, const TQString& name);
 
 	public slots:
 		//! Sets global project that is used to retrieve schema informationm for this combo box.
@@ -64,7 +65,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDataSourceComboBox : public KComboBox
 
 		/*! Sets item for data source described by \a mimeType and \a name.
 		 If \a mimeType is empty, either "kexi/table" and "kexi/query" are tried. */
-		void setDataSource(const QString& mimeType, const QString& name);
+		void setDataSource(const TQString& mimeType, const TQString& name);
 
 	signals:
 		//! Emitted whenever data source changes. 
@@ -74,12 +75,12 @@ class KEXIEXTWIDGETS_EXPORT KexiDataSourceComboBox : public KComboBox
 	protected slots:
 		void slotNewItemStored(KexiPart::Item& item);
 		void slotItemRemoved(const KexiPart::Item& item);
-		void slotItemRenamed(const KexiPart::Item& item, const QCString& oldName);
+		void slotItemRenamed(const KexiPart::Item& item, const TQCString& oldName);
 		void slotActivated( int index );
-		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;