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, 25 insertions, 22 deletions

diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
index 52ce5f27..548b4a35 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
@@ -20,8 +20,8 @@
 #ifndef KFORMDESIGNER_KDEVELOP_PART_H
 #define KFORMDESIGNER_KDEVELOP_PART_H
 
-#include <qwidget.h>
-#include <qpixmap.h>
+#include <tqwidget.h>
+#include <tqpixmap.h>
 
 #include <kinterfacedesigner/designer.h>
 #include <kparts/factory.h>
@@ -30,8 +30,8 @@
 
 class KAboutData;
 class KInstance;
-class QWorkspace;
-class QCloseEvent;
+class TQWorkspace;
+class TQCloseEvent;
 
 using KFormDesigner::Form;
 using namespace KInterfaceDesigner;
@@ -39,13 +39,14 @@ using namespace KInterfaceDesigner;
 class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		KFDFactory();
 		virtual ~KFDFactory();
 
-		virtual KParts::Part* createPartObject(QWidget *parentWidget=0, const char *widgetName=0, QObject *parent=0, const char *name=0,
-		  const char *classname="KParts::Part", const QStringList &args=QStringList());
+		virtual KParts::Part* createPartObject(TQWidget *tqparentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
 		static KAboutData *aboutData();
@@ -57,13 +58,14 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 class KFORMEDITOR_EXPORT KFormDesignerKDevPart : public Designer
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KFormDesignerKDevPart(QWidget *parent, const char *name, bool readOnly=true, const QStringList &args=QStringList());
+		KFormDesignerKDevPart(TQWidget *tqparent, const char *name, bool readOnly=true, const TQStringList &args=TQStringList());
 		virtual ~KFormDesignerKDevPart();
 
-		virtual DesignerType designerType() { return QtDesigner; }
-		virtual void openProject(const QString &) {}
+		virtual DesignerType designerType() { return TQtDesigner; }
+		virtual void openProject(const TQString &) {}
 
 //		KFormDesigner::FormManager*   manager()  { return m_manager; }
 		void      setUniqueFormMode(bool enable)  { m_uniqueFormMode = enable; }
@@ -83,15 +85,15 @@ class KFORMEDITOR_EXPORT KFormDesignerKDevPart : public Designer
 		void open();
 		void slotPreviewForm();
 		void saveAs();
-		void slotCreateFormSlot(KFormDesigner::Form *form, const QString &widget, const QString &signal);
+		void slotCreateFormSlot(KFormDesigner::Form *form, const TQString &widget, const TQString &signal);
 
 	protected slots:
 		void slotWidgetSelected(KFormDesigner::Form *form, bool multiple);
 		void slotFormWidgetSelected(KFormDesigner::Form *form);
 		void slotNoFormSelected();
 		void slotFormModified(KFormDesigner::Form *form, bool isDirty);
-		void setUndoEnabled(bool enabled, const QString &text);
-		void setRedoEnabled(bool enabled, const QString &text);
+		void setUndoEnabled(bool enabled, const TQString &text);
+		void setRedoEnabled(bool enabled, const TQString &text);
 
 	protected:
 		virtual bool openFile();
@@ -103,7 +105,7 @@ class KFORMEDITOR_EXPORT KFormDesignerKDevPart : public Designer
 	private:
 		static KFormDesigner::WidgetLibrary* static_formsLibrary;
 //		KFormDesigner::FormManager  *m_manager;
-		QWorkspace  *m_workspace;
+		TQWorkspace  *m_workspace;
 		int  m_count;
 		bool   m_uniqueFormMode;
 		bool   m_openingFile;
@@ -111,27 +113,28 @@ class KFORMEDITOR_EXPORT KFormDesignerKDevPart : public Designer
 };
 
 //! Helper: this widget is used to create form's surface
-class KFORMEDITOR_EXPORT FormWidgetBase : public QWidget, public KFormDesigner::FormWidget
+class KFORMEDITOR_EXPORT FormWidgetBase : public TQWidget, public KFormDesigner::FormWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		FormWidgetBase(KFormDesignerKDevPart *part, QWidget *parent = 0, const char *name = 0, int WFlags = WDestructiveClose)
-		: QWidget(parent, name, WFlags), m_part(part) {}
+		FormWidgetBase(KFormDesignerKDevPart *part, TQWidget *tqparent = 0, const char *name = 0, int WFlags = WDestructiveClose)
+		: TQWidget(tqparent, name, WFlags), m_part(part) {}
 		~FormWidgetBase() {;}
 
-		void drawRect(const QRect& r, int type);
-		void drawRects(const QValueList<QRect> &list, int type);
+		void drawRect(const TQRect& r, int type);
+		void drawRects(const TQValueList<TQRect> &list, int type);
 		void initRect();
 		void clearRect();
-		void highlightWidgets(QWidget *from, QWidget *to);//, const QPoint &p);
+		void highlightWidgets(TQWidget *from, TQWidget *to);//, const TQPoint &p);
 
 	protected:
-		void closeEvent(QCloseEvent *ev);
+		void closeEvent(TQCloseEvent *ev);
 
 	private:
-		QPixmap buffer; //!< stores grabbed entire form's area for redraw
-		QRect prev_rect; //!< previously selected rectangle
+		TQPixmap buffer; //!< stores grabbed entire form's area for redraw
+		TQRect prev_rect; //!< previously selected rectangle
 		KFormDesignerKDevPart  *m_part;
 };