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/widgets/kexidbtextedit.h b/kexi/plugins/forms/widgets/kexidbtextedit.h
index a380b070..c6f64136 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.h
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.h
@@ -33,17 +33,18 @@ class KEXIFORMUTILS_EXPORT KexiDBTextEdit :
 	public KexiFormDataItemInterface
 {
 	Q_OBJECT
-	Q_PROPERTY(QString dataSource READ dataSource WRITE setDataSource DESIGNABLE true)
-	Q_PROPERTY(QCString dataSourceMimeType READ dataSourceMimeType WRITE setDataSourceMimeType DESIGNABLE true)
+  TQ_OBJECT
+	TQ_PROPERTY(TQString dataSource READ dataSource WRITE setDataSource DESIGNABLE true)
+	TQ_PROPERTY(TQCString dataSourceMimeType READ dataSourceMimeType WRITE setDataSourceMimeType DESIGNABLE true)
 
 	public:
-		KexiDBTextEdit(QWidget *parent, const char *name=0);
+		KexiDBTextEdit(TQWidget *tqparent, const char *name=0);
 		virtual ~KexiDBTextEdit();
 
-		inline QString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
-		inline QCString dataSourceMimeType() const { return KexiFormDataItemInterface::dataSourceMimeType(); }
-		virtual QVariant value();
-		virtual void setInvalidState( const QString& displayText );
+		inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); }
+		inline TQCString dataSourceMimeType() const { return KexiFormDataItemInterface::dataSourceMimeType(); }
+		virtual TQVariant value();
+		virtual void setInvalidState( const TQString& displayText );
 
 		//! \return true if editor's value is null (not empty)
 		//! Used for checking if a given constraint within table of form is met.
@@ -59,7 +60,7 @@ class KEXIFORMUTILS_EXPORT KexiDBTextEdit :
 		virtual bool isReadOnly() const;
 
 		/*! \return the view widget of this item, e.g. line edit widget. */
-		virtual QWidget* widget();
+		virtual TQWidget* widget();
 
 		virtual bool cursorAtStart();
 		virtual bool cursorAtEnd();
@@ -71,16 +72,16 @@ class KEXIFORMUTILS_EXPORT KexiDBTextEdit :
 		 is displayed in a special way. Used by KexiFormDataProvider::fillDataItems(). 
 		 \a widget is equal to 'this'.
 		 Reimplemented after KexiFormDataItemInterface. */
-		virtual void setDisplayDefaultValue(QWidget* widget, bool displayDefaultValue);
+		virtual void setDisplayDefaultValue(TQWidget* widget, bool displayDefaultValue);
 
 		//! Windows uses Ctrl+Tab for moving between tabs, so do not steal this shortcut
-		virtual void keyPressEvent( QKeyEvent *ke );
+		virtual void keyPressEvent( TQKeyEvent *ke );
 
 	public slots:
-		inline void setDataSource(const QString &ds) { KexiFormDataItemInterface::setDataSource(ds); }
-		inline void setDataSourceMimeType(const QCString &ds) { KexiFormDataItemInterface::setDataSourceMimeType(ds); }
+		inline void setDataSource(const TQString &ds) { KexiFormDataItemInterface::setDataSource(ds); }
+		inline void setDataSourceMimeType(const TQCString &ds) { KexiFormDataItemInterface::setDataSourceMimeType(ds); }
 		virtual void setReadOnly( bool readOnly );
-		virtual void setText( const QString & text, const QString & context );
+		virtual void setText( const TQString & text, const TQString & context );
 
 		//! Reimplemented, so "undo" means the same as "cancelEditor" action
 //! @todo enable "real" undo internally so user can use ctrl+z while editing
@@ -99,9 +100,9 @@ class KEXIFORMUTILS_EXPORT KexiDBTextEdit :
 		void slotTextChanged();
 
 	protected:
-		virtual void paintEvent ( QPaintEvent * );
-		virtual void setValueInternal(const QVariant& add, bool removeOld);
-		QPopupMenu * createPopupMenu(const QPoint & pos);
+		virtual void paintEvent ( TQPaintEvent * );
+		virtual void setValueInternal(const TQVariant& add, bool removeOld);
+		TQPopupMenu * createPopupMenu(const TQPoint & pos);
 
 		//! Used for extending context menu
 		KexiDBWidgetContextMenuExtender m_menuExtender;