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, 34 insertions, 33 deletions

diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.h b/kexi/plugins/forms/widgets/kexidbcombobox.h
index 5208d37d..2639b1f9 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.h
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.h
@@ -35,15 +35,16 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 	public KexiDBAutoField, public KexiComboBoxBase
 {
 	Q_OBJECT
-	Q_PROPERTY( bool editable READ isEditable WRITE setEditable )
+  TQ_OBJECT
+	TQ_PROPERTY( bool editable READ isEditable WRITE setEditable )
 	//properties from KexiDBAutoField that should not be visible:
-	Q_OVERRIDE(QColor paletteBackgroundColor READ paletteBackgroundColor WRITE setPaletteBackgroundColor DESIGNABLE true RESET unsetPalette)
-	Q_OVERRIDE(QColor foregroundLabelColor DESIGNABLE false)
-	Q_OVERRIDE(QColor backgroundLabelColor DESIGNABLE false)
-	Q_OVERRIDE(bool autoCaption DESIGNABLE false)
+	TQ_OVERRIDE(TQColor paletteBackgroundColor READ paletteBackgroundColor WRITE setPaletteBackgroundColor DESIGNABLE true RESET unsetPalette)
+	TQ_OVERRIDE(TQColor foregroundLabelColor DESIGNABLE false)
+	TQ_OVERRIDE(TQColor backgroundLabelColor DESIGNABLE false)
+	TQ_OVERRIDE(bool autoCaption DESIGNABLE false)
 
 	public:
-		KexiDBComboBox(QWidget *parent, const char *name=0, bool designMode = true);
+		KexiDBComboBox(TQWidget *tqparent, const char *name=0, bool designMode = true);
 		virtual ~KexiDBComboBox();
 
 		//! Implemented for KexiComboBoxBase: form has no 'related data' model (only the full database model)
@@ -53,21 +54,21 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 		virtual KexiDB::Field *field() const { return KexiDBAutoField::field(); }
 
 		//! Implemented for KexiComboBoxBase
-		virtual QVariant origValue() const { return m_origValue; }
+		virtual TQVariant origValue() const { return m_origValue; }
 
 		void setEditable(bool set);
 		bool isEditable() const;
 
 		virtual void setLabelPosition(LabelPosition position);
 
-		virtual QVariant value() { return KexiComboBoxBase::value(); }
+		virtual TQVariant value() { return KexiComboBoxBase::value(); }
 
-		virtual QVariant visibleValue();
+		virtual TQVariant visibleValue();
 
 		//! Reimpemented because to avoid taking value from the internal editor (index is taken from the popup instead)
 		virtual bool valueChanged();
 
-		virtual QSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		//! Reimplemented after KexiDBAutoField: jsut sets \a cinfo without initializing a subwidget.
 		//! Initialization is performed by \ref setVisibleColumnInfo().
@@ -81,10 +82,10 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 		 Reimplemented. */
 		virtual KexiDB::QueryColumnInfo* visibleColumnInfo() const;
 
-		const QColor & paletteBackgroundColor() const { return KexiDBAutoField::paletteBackgroundColor(); }
+		const TQColor & paletteBackgroundColor() const { return KexiDBAutoField::paletteBackgroundColor(); }
 
 		//! Reimplemented to also set 'this' widget's background color, not only subwidget's.
-		virtual void setPaletteBackgroundColor( const QColor & color );
+		virtual void setPaletteBackgroundColor( const TQColor & color );
 
 		/*! Undoes changes made to this item - just resets the widget to original value. 
 		 Reimplemented after KexiFormDataItemInterface to also revert the visible value 
@@ -96,37 +97,37 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 		void slotItemSelected(KexiTableItem* item) { KexiComboBoxBase::slotItemSelected(item); }
 
 	protected slots:
-		void slotInternalEditorValueChanged(const QVariant& v)
+		void slotInternalEditorValueChanged(const TQVariant& v)
 			{ KexiComboBoxBase::slotInternalEditorValueChanged(v); }
 
 	protected:
-		QRect buttonGeometry() const;
+		TQRect buttonGeometry() const;
 
-		virtual void paintEvent( QPaintEvent * );
+		virtual void paintEvent( TQPaintEvent * );
 
-		virtual void mousePressEvent( QMouseEvent *e );
+		virtual void mousePressEvent( TQMouseEvent *e );
 
-		void mouseDoubleClickEvent( QMouseEvent *e );
+		void mouseDoubleClickEvent( TQMouseEvent *e );
 
-		virtual bool eventFilter( QObject *o, QEvent *e );
+		virtual bool eventFilter( TQObject *o, TQEvent *e );
 
-		//! \return internal editor's geometry
-		QRect editorGeometry() const;
+		//! \return internal editor's tqgeometry
+		TQRect editorGeometry() const;
 
 		//! Creates editor. Reimplemented, because if the combo box is not editable, 
 		//! editor should not be created.
 		virtual void createEditor();
 
 		/*! Reimplemented */
-		virtual void styleChange( QStyle& oldStyle );
+		virtual void styleChange( TQStyle& oldStyle );
 
 		/*! Reimplemented */
-		virtual void fontChange( const QFont & oldFont );
+		virtual void fontChange( const TQFont & oldFont );
 
 		virtual bool subwidgetStretchRequired(KexiDBAutoField* autoField) const;
 
 		//! Implemented for KexiComboBoxBase
-		virtual QWidget *internalEditor() const { return /*WidgetWithSubpropertiesInterface*/m_subwidget; }
+		virtual TQWidget *internalEditor() const { return /*WidgetWithSubpropertiesInterface*/m_subwidget; }
 
 		//! Implemented for KexiComboBoxBase. Does nothing if the widget is not editable.
 		virtual void moveCursorToEndInInternalEditor();
@@ -135,10 +136,10 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 		virtual void selectAllInInternalEditor();
 
 		//! Implemented for KexiComboBoxBase
-		virtual void setValueInInternalEditor(const QVariant& value);
+		virtual void setValueInInternalEditor(const TQVariant& value);
 
 		//! Implemented for KexiComboBoxBase
-		virtual QVariant valueFromInternalEditor();
+		virtual TQVariant valueFromInternalEditor();
 
 		//! Implemented for KexiComboBoxBase
 		virtual void editRequested();
@@ -146,21 +147,21 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 		//! Implemented for KexiComboBoxBase
 		virtual void acceptRequested();
 
-		//! Implement this to return a position \a pos mapped from parent (e.g. viewport) 
-		//! to global coordinates. QPoint(-1, -1) should be returned if this cannot be computed.
-		virtual QPoint mapFromParentToGlobal(const QPoint& pos) const;
+		//! Implement this to return a position \a pos mapped from tqparent (e.g. viewport) 
+		//! to global coordinates. TQPoint(-1, -1) should be returned if this cannot be computed.
+		virtual TQPoint mapFromParentToGlobal(const TQPoint& pos) const;
 
 		//! Implement this to return a hint for popup width.
 		virtual int popupWidthHint() const;
 
-		virtual void setValueInternal(const QVariant& add, bool removeOld);
+		virtual void setValueInternal(const TQVariant& add, bool removeOld);
 
 		//! Implemented to handle visible value instead of index
-		virtual void setVisibleValueInternal(const QVariant& value);
+		virtual void setVisibleValueInternal(const TQVariant& value);
 
-		bool handleMousePressEvent(QMouseEvent *e);
+		bool handleMousePressEvent(TQMouseEvent *e);
 
-		bool handleKeyPressEvent(QKeyEvent *ke);
+		bool handleKeyPressEvent(TQKeyEvent *ke);
 
 		//! Implemented for KexiDataItemInterface
 		virtual void beforeSignalValueChanged();
@@ -172,7 +173,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 		 Used for Key_Escape to if the popup is visible,
 		 so the key press won't be consumed to perform "cancel editing". 
 		 Also used for grabbing page down/up keys. */
-		virtual bool keyPressed(QKeyEvent *ke);
+		virtual bool keyPressed(TQKeyEvent *ke);
 
 		class Private;
 		Private * const d;