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, 71 insertions, 61 deletions

diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index 1092d852..b8623fad 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -37,220 +37,230 @@ namespace KFormDesigner
 class InsertPageCommand : public KCommand
 {
 	public:
-		InsertPageCommand(KFormDesigner::Container *container, QWidget *widget);
+		InsertPageCommand(KFormDesigner::Container *container, TQWidget *widget);
 
 		virtual void execute();
 		virtual void unexecute();
-		virtual QString name() const;
+		virtual TQString name() const;
 
 	protected:
 		KFormDesigner::Form *m_form;
-		QString  m_containername;
-		QString  m_name;
-		QString  m_parentname;
+		TQString  m_containername;
+		TQString  m_name;
+		TQString  m_parentname;
 		int      m_pageid;
 };
 
 //! Helper widget (used when using 'Lay out horizontally')
-class KFORMEDITOR_EXPORT HBox : public QFrame
+class KFORMEDITOR_EXPORT HBox : public TQFrame
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		HBox(QWidget *parent, const char *name);
+		HBox(TQWidget *tqparent, const char *name);
 		virtual ~HBox(){;}
 		void setPreviewMode() {m_preview = true;}
-		virtual void paintEvent(QPaintEvent *ev);
+		virtual void paintEvent(TQPaintEvent *ev);
 
 	protected:
 		bool  m_preview;
 };
 
 //! Helper widget (used when using 'Lay out vertically')
-class KFORMEDITOR_EXPORT VBox : public QFrame
+class KFORMEDITOR_EXPORT VBox : public TQFrame
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		VBox(QWidget *parent, const char *name);
+		VBox(TQWidget *tqparent, const char *name);
 		virtual ~VBox(){;}
 		void setPreviewMode() {m_preview = true;}
-		virtual void paintEvent(QPaintEvent *ev);
+		virtual void paintEvent(TQPaintEvent *ev);
 
 	protected:
 		bool  m_preview;
 };
 
 //! Helper widget (used when using 'Lay out in a grid')
-class KFORMEDITOR_EXPORT Grid : public QFrame
+class KFORMEDITOR_EXPORT Grid : public TQFrame
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		Grid(QWidget *parent, const char *name);
+		Grid(TQWidget *tqparent, const char *name);
 		virtual ~Grid(){;}
 		void setPreviewMode() {m_preview = true;}
-		virtual void paintEvent(QPaintEvent *ev);
+		virtual void paintEvent(TQPaintEvent *ev);
 
 	protected:
 		bool  m_preview;
 };
 
 //! Helper widget (used when using 'Lay out with horizontal flow')
-class KFORMEDITOR_EXPORT HFlow : public QFrame
+class KFORMEDITOR_EXPORT HFlow : public TQFrame
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		HFlow(QWidget *parent, const char *name);
+		HFlow(TQWidget *tqparent, const char *name);
 		virtual ~HFlow(){;}
 		void setPreviewMode() {m_preview = true;}
-		virtual void paintEvent(QPaintEvent *ev);
+		virtual void paintEvent(TQPaintEvent *ev);
 
 	protected:
 		bool  m_preview;
 };
 
 //! Helper widget (used when using 'Lay out with horizontal flow')
-class KFORMEDITOR_EXPORT VFlow : public QFrame
+class KFORMEDITOR_EXPORT VFlow : public TQFrame
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		VFlow(QWidget *parent, const char *name);
+		VFlow(TQWidget *tqparent, const char *name);
 		virtual ~VFlow(){;}
 		void setPreviewMode() {m_preview = true;}
-		virtual void paintEvent(QPaintEvent *ev);
-		virtual QSize sizeHint() const;
+		virtual void paintEvent(TQPaintEvent *ev);
+		virtual TQSize tqsizeHint() const;
 
 	protected:
 		bool  m_preview;
 };
 
 //! A simple container widget
-class KFORMEDITOR_EXPORT ContainerWidget : public QWidget
+class KFORMEDITOR_EXPORT ContainerWidget : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	friend class KFDTabWidget;
 
 	public:
-		ContainerWidget(QWidget *parent, const char *name);
+		ContainerWidget(TQWidget *tqparent, const char *name);
 		virtual ~ContainerWidget();
 
-		virtual QSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
-		virtual void dragMoveEvent( QDragMoveEvent *e );
+		virtual void dragMoveEvent( TQDragMoveEvent *e );
 
 		//! Used to emit handleDropEvent() signal needed to control dropping on the container's surface
-		virtual void dropEvent( QDropEvent *e );
+		virtual void dropEvent( TQDropEvent *e );
 
 	signals:
 		//! Needed to control dragging over the container's surface
-		void handleDragMoveEvent(QDragMoveEvent *e);
+		void handleDragMoveEvent(TQDragMoveEvent *e);
 
 		//! Needed to control dropping on the container's surface
-		void handleDropEvent(QDropEvent *e);
+		void handleDropEvent(TQDropEvent *e);
 };
 
 //! A tab widget
 class KFORMEDITOR_EXPORT KFDTabWidget : public KFormDesigner::TabWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KFDTabWidget(QWidget *parent, const char *name);
+		KFDTabWidget(TQWidget *tqparent, const char *name);
 		virtual ~KFDTabWidget();
 
-		virtual QSize sizeHint() const;
+		virtual TQSize tqsizeHint() const;
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
-		virtual void dragMoveEvent( QDragMoveEvent *e );
+		virtual void dragMoveEvent( TQDragMoveEvent *e );
 
 		//! Used to emit handleDropEvent() signal needed to control dropping on the container's surface
-		virtual void dropEvent( QDropEvent *e );
+		virtual void dropEvent( TQDropEvent *e );
 
 	signals:
 		//! Needed to control dragging over the container's surface
-		void handleDragMoveEvent(QDragMoveEvent *e);
+		void handleDragMoveEvent(TQDragMoveEvent *e);
 
 		//! Needed to control dropping on the container's surface
-		void handleDropEvent(QDropEvent *e);
+		void handleDropEvent(TQDropEvent *e);
 };
 
 //! A group box widget
-class KFORMEDITOR_EXPORT GroupBox : public QGroupBox
+class KFORMEDITOR_EXPORT GroupBox : public TQGroupBox
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		GroupBox(const QString & title, QWidget *parent, const char *name);
+		GroupBox(const TQString & title, TQWidget *tqparent, const char *name);
 		virtual ~GroupBox();
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
-		virtual void dragMoveEvent( QDragMoveEvent *e );
+		virtual void dragMoveEvent( TQDragMoveEvent *e );
 
 		//! Used to emit handleDropEvent() signal needed to control dropping on the container's surface
-		virtual void dropEvent( QDropEvent *e );
+		virtual void dropEvent( TQDropEvent *e );
 
 	signals:
 		//! Needed to control dragging over the container's surface
-		void handleDragMoveEvent(QDragMoveEvent *e);
+		void handleDragMoveEvent(TQDragMoveEvent *e);
 
 		//! Needed to control dropping on the container's surface
-		void handleDropEvent(QDropEvent *e);
+		void handleDropEvent(TQDropEvent *e);
 };
 
 //! A form embedded as a widget inside other form
-class KFORMEDITOR_EXPORT SubForm : public QScrollView
+class KFORMEDITOR_EXPORT SubForm : public TQScrollView
 {
 	Q_OBJECT
-	Q_PROPERTY(QString formName READ formName WRITE setFormName DESIGNABLE true)
+  TQ_OBJECT
+	TQ_PROPERTY(TQString formName READ formName WRITE setFormName DESIGNABLE true)
 
 	public:
-		SubForm(QWidget *parent, const char *name);
+		SubForm(TQWidget *tqparent, const char *name);
 		~SubForm() {}
 
 		//! \return the name of the subform inside the db
-		QString   formName() const { return m_formName; }
-		void      setFormName(const QString &name);
+		TQString   formName() const { return m_formName; }
+		void      setFormName(const TQString &name);
 
 	private:
 //		KFormDesigner::FormManager *m_manager;
 		KFormDesigner::Form   *m_form;
-		QWidget  *m_widget;
-		QString   m_formName;
+		TQWidget  *m_widget;
+		TQString   m_formName;
 };
 
 //! Standard Factory for all container widgets
 class ContainerFactory : public KFormDesigner::WidgetFactory
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		ContainerFactory(QObject *parent, const char *name, const QStringList &args);
+		ContainerFactory(TQObject *tqparent, const char *name, const TQStringList &args);
 		virtual ~ContainerFactory();
 
-		virtual QWidget *createWidget(const QCString & classname, QWidget *parent, const char *name, KFormDesigner::Container *container,
+		virtual TQWidget *createWidget(const TQCString & classname, TQWidget *tqparent, const char *name, KFormDesigner::Container *container,
 			int options = DefaultOptions);
-		virtual bool createMenuActions(const QCString& classname, QWidget *w, QPopupMenu *menu,
+		virtual bool createMenuActions(const TQCString& classname, TQWidget *w, TQPopupMenu *menu,
 			KFormDesigner::Container *container);
-		virtual bool startEditing(const QCString &classname, QWidget *w,
+		virtual bool startEditing(const TQCString &classname, TQWidget *w,
 			KFormDesigner::Container *container);
-		virtual bool previewWidget(const QCString &classname, QWidget *widget,
+		virtual bool previewWidget(const TQCString &classname, TQWidget *widget,
 			KFormDesigner::Container *container);
-		virtual bool saveSpecialProperty(const QCString &classname, const QString &name,
-			const QVariant &value, QWidget *w, QDomElement &parentNode, QDomDocument &parent);
-		virtual bool readSpecialProperty(const QCString &classname, QDomElement &node, QWidget *w,
+		virtual bool saveSpecialProperty(const TQCString &classname, const TQString &name,
+			const TQVariant &value, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent);
+		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			KFormDesigner::ObjectTreeItem *item);
-		virtual QValueList<QCString> autoSaveProperties(const QCString &classname);
+		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
 
 	protected:
-		virtual bool isPropertyVisibleInternal(const QCString &classname, QWidget *w, 
-			const QCString &property, bool isTopLevel);
-		virtual bool changeText(const QString &newText);
-		virtual void resizeEditor(QWidget *editor, QWidget *widget, const QCString &classname);
+		virtual bool isPropertyVisibleInternal(const TQCString &classname, TQWidget *w, 
+			const TQCString &property, bool isTopLevel);
+		virtual bool changeText(const TQString &newText);
+		virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname);
 
 	public slots:
 		void addTabPage();
@@ -263,7 +273,7 @@ class ContainerFactory : public KFormDesigner::WidgetFactory
 		void reorderTabs(int oldpos, int newpos);
 
 	private:
-//		QWidget *m_widget;
+//		TQWidget *m_widget;
 //		KFormDesigner::Container *m_container;
 //		KFormDesigner::FormManager  *m_manager;
 };