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

diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp
index 1e7f24a2..ccad645c 100644
--- a/kexi/plugins/macros/kexiactions/executeaction.cpp
+++ b/kexi/plugins/macros/kexiactions/executeaction.cpp
@@ -32,8 +32,8 @@
 using namespace KexiMacro;
 
 namespace KexiMacro {
-	static const QString OBJECT = "object";
-	static const QString NAME = "name";
+	static const TQString OBJECT = "object";
+	static const TQString NAME = "name";
 }
 
 ExecuteAction::ExecuteAction()
@@ -50,7 +50,7 @@ ExecuteAction::~ExecuteAction()
 {
 }
 
-bool ExecuteAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const QString& name)
+bool ExecuteAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
 {
 	kdDebug()<<"ExecuteAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl;
 	KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
@@ -61,8 +61,8 @@ bool ExecuteAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, cons
 
 	variable->clearChildren();
 	if(name == OBJECT) {
-		const QString objectvalue = macroitem->variant(OBJECT, true).toString(); // e.g. "macro" or "script"
-		const QString objectname = macroitem->variant(NAME, true).toString(); // e.g. "macro1" or "macro2" if objectvalue above is "macro"
+		const TQString objectvalue = macroitem->variant(OBJECT, true).toString(); // e.g. "macro" or "script"
+		const TQString objectname = macroitem->variant(NAME, true).toString(); // e.g. "macro1" or "macro2" if objectvalue above is "macro"
 		macroitem->variable(NAME, true)->setChildren(
 			KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ObjectNameVariable<ExecuteAction>(this, objectvalue, objectname)) );
 	}
@@ -77,17 +77,17 @@ void ExecuteAction::activate(KSharedPtr<KoMacro::Context> context)
 		return;
 	}
 
-	const QString mimetype = QString("kexi/%1").arg( context->variable("object")->variant().toString() );
-	const QString name = context->variable("name")->variant().toString();
+	const TQString mimetype = TQString("kexi/%1").tqarg( context->variable("object")->variant().toString() );
+	const TQString name = context->variable("name")->variant().toString();
 
 	KexiPart::Part* part = Kexi::partManager().partForMimeType(mimetype);
 	if(! part) {
-		throw KoMacro::Exception(i18n("No such mimetype \"%1\"").arg(mimetype));
+		throw KoMacro::Exception(i18n("No such mimetype \"%1\"").tqarg(mimetype));
 	}
 
 	KexiPart::Item* item = mainWin()->project()->item(part->info(), name);
 	if(! item) {
-		throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").arg(name).arg(mimetype));
+		throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").tqarg(name).tqarg(mimetype));
 	}
 
 	part->execute(item);