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, 9 insertions, 8 deletions

diff --git a/kexi/plugins/macros/lib/context.h b/kexi/plugins/macros/lib/context.h
index dd467dad..558ff0aa 100644
--- a/kexi/plugins/macros/lib/context.h
+++ b/kexi/plugins/macros/lib/context.h
@@ -20,7 +20,7 @@
 #ifndef KOMACRO_CONTEXT_H
 #define KOMACRO_CONTEXT_H
 
-#include <qobject.h>
+#include <tqobject.h>
 #include <ksharedptr.h>
 
 #include "variable.h"
@@ -35,14 +35,15 @@ namespace KoMacro {
 
 	/**
 	* The context of an execution. If a @a Macro got executed it creates
-	* an instance of this class and passes it around all it's children
+	* an instance of this class and passes it around all it's tqchildren
 	* as local execution context.
 	*/
 	class KOMACRO_EXPORT Context
-		: public QObject
+		: public TQObject
 		, public KShared
 	{
 			Q_OBJECT
+  TQ_OBJECT
 		public:
 
 			/**
@@ -61,13 +62,13 @@ namespace KoMacro {
 			* @return true if there exists a variable with name @p name
 			* else false got returned.
 			*/
-			bool hasVariable(const QString& name) const;
+			bool hasVariable(const TQString& name) const;
 
 			/**
 			* @return the @a Variable defined with name @p name or
 			* NULL if there exists no such variable.
 			*/
-			KSharedPtr<Variable> variable(const QString& name) const;
+			KSharedPtr<Variable> variable(const TQString& name) const;
 
 			/**
 			* @return a map of all @a Variable instance that are defined
@@ -79,7 +80,7 @@ namespace KoMacro {
 			* Set the variable @p variable defined with name @p name . If
 			* there exists already a variable with that name replace it.
 			*/
-			void setVariable(const QString& name, KSharedPtr<Variable> variable);
+			void setVariable(const TQString& name, KSharedPtr<Variable> variable);
 
 			/**
 			* @return the associated macro 
@@ -113,14 +114,14 @@ namespace KoMacro {
 			* remembers what @a Action should be executed next and
 			* calling this slot just activates those @a Action .
 			*/
-			virtual void activate(QValueList<KSharedPtr <MacroItem> >::ConstIterator it);
+			virtual void activate(TQValueList<KSharedPtr <MacroItem> >::ConstIterator it);
 
 		public slots:
 
 			/**
 			* This slot extends the slot above with the passed
 			* @a Context @p context which will be used as
-			* parent context for this context.
+			* tqparent context for this context.
 			*/
 			virtual void activate(KSharedPtr<Context> context);