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, 28 insertions, 27 deletions

diff --git a/kexi/core/kexiinternalpart.h b/kexi/core/kexiinternalpart.h
index 232c3f84..4abf1d19 100644
--- a/kexi/core/kexiinternalpart.h
+++ b/kexi/core/kexiinternalpart.h
@@ -21,9 +21,9 @@
 #ifndef KEXIINTERNALPART_H
 #define KEXIINTERNALPART_H
 
-#include <qobject.h>
-#include <qguardedptr.h>
-#include <qvariant.h>
+#include <tqobject.h>
+#include <tqguardedptr.h>
+#include <tqvariant.h>
 
 class KexiMainWindow;
 class KexiDialogBase;
@@ -33,7 +33,7 @@ namespace KexiDB {
 	class MessageHandler;
 }
 
-class QWidget;
+class TQWidget;
 
 /**
  * @short A prototype for Kexi Internal Parts (plugins) implementation.
@@ -46,15 +46,16 @@ class QWidget;
  * Parts can have unique flag set for dialogs (true by default) 
  * - then a dialog created by createDialogInstance() is unique.
  */
-class KEXICORE_EXPORT KexiInternalPart : public QObject
+class KEXICORE_EXPORT KexiInternalPart : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		KexiInternalPart(QObject *parent, const char *name, const QStringList &);
+		KexiInternalPart(TQObject *tqparent, const char *name, const TQStringList &);
 		virtual ~KexiInternalPart();
 	
-		KexiDialogBase *instance(KexiMainWindow *parent);
+		KexiDialogBase *instance(KexiMainWindow *tqparent);
 
 		/*! Creates a new widget instance using part \a partName.
 		 \a widgetClass is a pseudo class used in case when the part offers more 
@@ -63,28 +64,28 @@ class KEXICORE_EXPORT KexiInternalPart : public QObject
 		 \a args is two-way optional argument: it can contain custom options used 
 		 on widget's creation. Depending on implementation, the created widget can write its 
 		 state (e.g. result or status information) back to this argument.
-		 Created widget will have assigned \a parent widget and \a objName name. */
-		static QWidget* createWidgetInstance(const char* partName, const char* widgetClass, 
+		 Created widget will have assigned \a tqparent widget and \a objName name. */
+		static TQWidget* createWidgetInstance(const char* partName, const char* widgetClass, 
 			KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-			QWidget *parent, const char *objName = 0, QMap<QString,QString>* args = 0);
+			TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0);
 
 		/*! For convenience. */
-		static QWidget* createWidgetInstance(const char* partName,
+		static TQWidget* createWidgetInstance(const char* partName,
 			KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-			QWidget *parent, const char *objName = 0, QMap<QString,QString>* args = 0)
-		 { return createWidgetInstance(partName, 0, msgHdr, mainWin, parent, objName, args); }
+			TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0)
+		 { return createWidgetInstance(partName, 0, msgHdr, mainWin, tqparent, objName, args); }
 
 		/*! Creates a new dialog instance. If such instance already exists, 
 		 and is unique (see uniqueDialog()) it is just returned.
 		 The part knows about destroying its dialog instance, (if it is uinque), 
 		 so on another call the dialog will be created again. 
 		 \a msgHdr is a message handler for displaying error messages.
-		 The dialog is assigned to \a mainWin as its parent, 
+		 The dialog is assigned to \a mainWin as its tqparent, 
 		 and \a objName name is set. */
 		static KexiDialogBase* createKexiDialogInstance(const char* partName, 
 			KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, const char *objName = 0);
 
-		/*! Creates a new modal dialog instance (QDialog or a subclass). 
+		/*! Creates a new modal dialog instance (TQDialog or a subclass). 
 		 If such instance already exists, and is unique (see uniqueDialog()) 
 		 it is just returned.
 		 \a dialogClass is a pseudo class used in case when the part offers more 
@@ -95,22 +96,22 @@ class KEXICORE_EXPORT KexiInternalPart : public QObject
 		 state (e.g. result or status information) back to this argument.
 		 The part knows about destroying its dialog instance, (if it is uinque), 
 		 so on another call the dialog will be created again. 
-		 The dialog is assigned to \a mainWin as its parent, 
+		 The dialog is assigned to \a mainWin as its tqparent, 
 		 and \a objName name is set. */
-		static QDialog* createModalDialogInstance(const char* partName, 
+		static TQDialog* createModalDialogInstance(const char* partName, 
 			const char* dialogClass, KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, 
-			const char *objName = 0, QMap<QString,QString>* args = 0);
+			const char *objName = 0, TQMap<TQString,TQString>* args = 0);
 
 		/*! Adeded For convenience. */
-		static QDialog* createModalDialogInstance(const char* partName, 
+		static TQDialog* createModalDialogInstance(const char* partName, 
 			KexiDB::MessageHandler *msgHdr, KexiMainWindow* mainWin, const char *objName = 0, 
-			QMap<QString,QString>* args = 0)
+			TQMap<TQString,TQString>* args = 0)
 		{ return createModalDialogInstance(partName, 0, msgHdr, mainWin, objName, args); }
 
 		/*! Executes a command \a commandName (usually nonvisual) using part called \a partName.
 		 The result can be put into the \a args. \return true on successful calling. */
 		static bool executeCommand(const char* partName, 
-			KexiMainWindow* mainWin, const char* commandName, QMap<QString,QString>* args = 0);
+			KexiMainWindow* mainWin, const char* commandName, TQMap<TQString,TQString>* args = 0);
 
 		/*! \return internal part of a name \a partName. Shouldn't be usable. */
 		static const KexiInternalPart* part(KexiDB::MessageHandler *msgHdr, const char* partName);
@@ -129,9 +130,9 @@ class KEXICORE_EXPORT KexiInternalPart : public QObject
 		 const char *objName);
 
 		/*! Reimplement this if your internal part has to return widgets 
-		 or QDialog objects. */
-		virtual QWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
-			QWidget * parent, const char * objName = 0, QMap<QString,QString>* args = 0);
+		 or TQDialog objects. */
+		virtual TQWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, 
+			TQWidget * tqparent, const char * objName = 0, TQMap<TQString,TQString>* args = 0);
 		
 //		//! Reimplement this if your internal part has to return dialogs
 //		virtual KexiDialogBase *createDialog(KexiMainWindow* /*mainWin*/, 
@@ -139,17 +140,17 @@ class KEXICORE_EXPORT KexiInternalPart : public QObject
 //		 { return 0; }
 		
 		/*! Reimplement this if your internal part has to return a view object. */
-		virtual KexiViewBase *createView(KexiMainWindow* mainWin, QWidget * parent,
+		virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget * tqparent,
 			const char *objName = 0);
 
 		/*! Reimplement this if your internal part has to execute a command \a commandName 
 		 (usually nonvisual). Arguments are put into \a args and the result can be put into the \a args.
 		 \return true on successful calling. */
 		virtual bool executeCommand(KexiMainWindow* mainWin, const char* commandName, 
-			QMap<QString,QString>* args = 0);
+			TQMap<TQString,TQString>* args = 0);
 
 		//! Unique dialog - we're using guarded ptr for the dialog so can know if it has been closed
-		QGuardedPtr<QWidget> m_uniqueWidget; 
+		TQGuardedPtr<TQWidget> m_uniqueWidget; 
 		
 		bool m_uniqueDialog : 1; //!< true if createDialogInstance() should return only one dialog