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, 21 insertions, 20 deletions

diff --git a/kexi/widget/kexipropertyeditorview.h b/kexi/widget/kexipropertyeditorview.h
index 77dab6c8..79adb9e0 100644
--- a/kexi/widget/kexipropertyeditorview.h
+++ b/kexi/widget/kexipropertyeditorview.h
@@ -22,9 +22,9 @@
 #define KEXIPROPERTYEDITORVIEW_H
 
 //#include "kexiviewbase.h"
-#include <qwidget.h>
+#include <tqwidget.h>
 
-class QLabel;
+class TQLabel;
 class KexiMainWindow;
 
 namespace KoProperty {
@@ -44,25 +44,25 @@ namespace KoProperty {
  - [button_icon] Button "quit"
  - [label_icon] Label "welcome"
 */
-class KEXIEXTWIDGETS_EXPORT KexiObjectInfoLabel : public QWidget
+class KEXIEXTWIDGETS_EXPORT KexiObjectInfoLabel : public TQWidget
 {
 	public:
-		KexiObjectInfoLabel(QWidget* parent, const char* name = 0);
+		KexiObjectInfoLabel(TQWidget* tqparent, const char* name = 0);
 		~KexiObjectInfoLabel();
 
-		void setObjectClassIcon(const QString& name);
-		QString objectClassIcon() const { return m_classIcon; }
-		void setObjectClassName(const QString& name);
-		QString objectClassName() const { return m_className; }
-		void setObjectName(const QString& name);
-		QString objectName() const { return m_objectName; }
-		void setBuddy( QWidget * buddy );
+		void setObjectClassIcon(const TQString& name);
+		TQString objectClassIcon() const { return m_classIcon; }
+		void setObjectClassName(const TQString& name);
+		TQString objectClassName() const { return m_className; }
+		void setObjectName(const TQString& name);
+		TQString objectName() const { return m_objectName; }
+		void setBuddy( TQWidget * buddy );
 	protected:
 		void updateName();
 
-		QString m_className;
-		QString m_classIcon, m_objectName;
-		QLabel *m_objectIconLabel, *m_objectNameLabel;
+		TQString m_className;
+		TQString m_classIcon, m_objectName;
+		TQLabel *m_objectIconLabel, *m_objectNameLabel;
 };
 
 //! @short The container (acts as a dock window) for KexiPropertyEditor.
@@ -79,12 +79,13 @@ class KEXIEXTWIDGETS_EXPORT KexiObjectInfoLabel : public QWidget
    property instead of "name" - this can be usable when we know that "caption" properties
    are available for a given type of objects (this is the case for Table Designer fields)
 */
-class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public QWidget
+class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiPropertyEditorView(KexiMainWindow *mainWin, QWidget* parent);
+		KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* tqparent);
 		virtual ~KexiPropertyEditorView();
 
 		/*! Helper function. Updates \a infoLabel widget by reusing properties provided 
@@ -96,14 +97,14 @@ class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public QWidget
 		 hidden. */
 		static void updateInfoLabelForPropertySet(
 			KexiObjectInfoLabel *infoLabel, KoProperty::Set* set, 
-			const QString& textToDisplayForNullSet = QString::null);
+			const TQString& textToDisplayForNullSet = TQString());
 
-		virtual QSize sizeHint() const;
-		virtual QSize minimumSizeHint() const;
+		virtual TQSize tqsizeHint() const;
+		virtual TQSize tqminimumSizeHint() const;
 		KoProperty::Editor *editor() const;
 
 //	public slots:
-//		virtual void setGeometry( const QRect &r );
+//		virtual void setGeometry( const TQRect &r );
 //		virtual void resize( int w, int h );
 
 	protected slots: