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

diff --git a/kexi/plugins/macros/lib/action.cpp b/kexi/plugins/macros/lib/action.cpp
index e2dc0b64..db5596b4 100644
--- a/kexi/plugins/macros/lib/action.cpp
+++ b/kexi/plugins/macros/lib/action.cpp
@@ -37,21 +37,21 @@ namespace KoMacro {
 			/**
 			* The name this @a Action has.
 			*/
-			QString name;
+			TQString name;
 
 			/**
 			* The i18n-caption text this @a Action has.
 			*/
-			QString text;
+			TQString text;
 
 			/**
 			* The comment the user is able to define for each action.
 			*/
-			QString comment;
+			TQString comment;
 
 			/**
 			 * A map of @a Variable instances this @a Action
-			 * provides accessible by there QString name.
+			 * provides accessible by there TQString name.
 			 */
 			Variable::Map varmap;
 
@@ -60,14 +60,14 @@ namespace KoMacro {
 			* sorted order for the @a Variable instances
 			* defined in the map above.
 			*/
-			QStringList varnames;
+			TQStringList varnames;
 
 	};
 
 }
 
-Action::Action(const QString& name, const QString& text)
-	: QObject()
+Action::Action(const TQString& name, const TQString& text)
+	: TQObject()
 	, KShared()
 	, d( new Private() ) // create the private d-pointer instance.
 {
@@ -81,55 +81,55 @@ Action::Action(const QString& name, const QString& text)
 
 Action::~Action()
 {
-	//kdDebug() << QString("Action::~Action() name=\"%1\"").arg(name()) << endl;
+	//kdDebug() << TQString("Action::~Action() name=\"%1\"").tqarg(name()) << endl;
 
 	// destroy the private d-pointer instance.
 	delete d;
 }
 
-const QString Action::toString() const
+const TQString Action::toString() const
 {
-	return QString("Action:%1").arg(name());
+	return TQString("Action:%1").tqarg(name());
 }
 
-const QString Action::name() const
+const TQString Action::name() const
 {
 	return d->name;
 }
 
-void Action::setName(const QString& name)
+void Action::setName(const TQString& name)
 {
 	d->name = name;
 }
 
-const QString Action::text() const
+const TQString Action::text() const
 {
 	return d->text;
 }
 
-void Action::setText(const QString& text)
+void Action::setText(const TQString& text)
 {
 	d->text = text;
 }
 
-const QString Action::comment() const
+const TQString Action::comment() const
 {
 	return d->comment;
 }
 
-void Action::setComment(const QString& comment)
+void Action::setComment(const TQString& comment)
 {
 	d->comment = comment;
 }
 
-bool Action::hasVariable(const QString& name) const
+bool Action::hasVariable(const TQString& name) const
 {
-	return d->varmap.contains(name);
+	return d->varmap.tqcontains(name);
 }
 
-KSharedPtr<Variable> Action::variable(const QString& name) const
+KSharedPtr<Variable> Action::variable(const TQString& name) const
 {
-	return d->varmap.contains(name) ? d->varmap[name] : KSharedPtr<Variable>(0);
+	return d->varmap.tqcontains(name) ? d->varmap[name] : KSharedPtr<Variable>(0);
 }
 
 Variable::Map Action::variables() const
@@ -137,21 +137,21 @@ Variable::Map Action::variables() const
 	return d->varmap;
 }
 
-QStringList Action::variableNames() const
+TQStringList Action::variableNames() const
 {
 	return d->varnames;
 }
 
 void Action::setVariable(KSharedPtr<Variable> variable)
 {
-	const QString name = variable->name();
-	if(! d->varmap.contains(name)) {
+	const TQString name = variable->name();
+	if(! d->varmap.tqcontains(name)) {
 		d->varnames.append(name);
 	}
-	d->varmap.replace(name, variable);
+	d->varmap.tqreplace(name, variable);
 }
 
-void Action::setVariable(const QString& name, const QString& text, const QVariant& variant)
+void Action::setVariable(const TQString& name, const TQString& text, const TQVariant& variant)
 {
 	Variable* variable = new Variable(variant);
 	variable->setName(name);
@@ -159,9 +159,9 @@ void Action::setVariable(const QString& name, const QString& text, const QVarian
 	setVariable( KSharedPtr<Variable>(variable) );
 }
 
-void Action::removeVariable(const QString& name)
+void Action::removeVariable(const TQString& name)
 {
-	if(d->varmap.contains(name)) {
+	if(d->varmap.tqcontains(name)) {
 		d->varmap.remove(name);
 		d->varnames.remove(name);
 	}