1 files changed, 24 insertions, 24 deletions

diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp
index 90b13e4f4..fff0eaf5b 100644
--- a/kexi/plugins/macros/kexiactions/datatableaction.cpp
+++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp
@@ -33,9 +33,9 @@ using namespace KexiMacro;
 
 namespace KexiMacro {
 
-	//static const QString OBJECT = "method";
-	//static const QString OBJECT = "type";
-	//static const QString OBJECT = "partitem";
+	//static const TQString OBJECT = "method";
+	//static const TQString OBJECT = "type";
+	//static const TQString OBJECT = "partitem";
 
 	template<class ACTIONIMPL>
 	class MethodVariable : public KexiVariable<ACTIONIMPL>
@@ -44,7 +44,7 @@ namespace KexiMacro {
 			MethodVariable(ACTIONIMPL* actionimpl)
 				: KexiVariable<ACTIONIMPL>(actionimpl, "method", i18n("Method"))
 			{
-				QStringList list;
+				TQStringList list;
 				list << "import" << "export";
 				this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );
 
@@ -59,7 +59,7 @@ namespace KexiMacro {
 			TypeVariable(ACTIONIMPL* actionimpl)
 				: KexiVariable<ACTIONIMPL>(actionimpl, "type", i18n("Type"))
 			{
-				QStringList list;
+				TQStringList list;
 				list << "file" << "clipboard";
 				this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );
 
@@ -71,10 +71,10 @@ namespace KexiMacro {
 	class PartItemVariable : public KexiVariable<ACTIONIMPL>
 	{
 		public:
-			PartItemVariable(ACTIONIMPL* actionimpl, const QString& partitem = QString::null)
+			PartItemVariable(ACTIONIMPL* actionimpl, const TQString& partitem = TQString())
 				: KexiVariable<ACTIONIMPL>(actionimpl, "partitem", i18n("Item"))
 			{
-				QStringList namelist;
+				TQStringList namelist;
 				if(actionimpl->mainWin()->project()) {
 					KexiPart::PartInfoList* parts = Kexi::partManager().partInfoList();
 					for(KexiPart::PartInfoListIterator it(*parts); it.current(); ++it) {
@@ -86,14 +86,14 @@ namespace KexiMacro {
 							for(KexiPart::ItemDictIterator item_it = *items; item_it.current(); ++item_it)
 								namelist << info->objectName() + "." + item_it.current()->name();
 					}
-					for(QStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
+					for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
 						this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
 
-					//const QString name = info->objectName(); //info->groupName();
+					//const TQString name = info->objectName(); //info->groupName();
 					//this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) );
 				}
-				const QString n =
-					namelist.contains(partitem)
+				const TQString n =
+					namelist.tqcontains(partitem)
 						? partitem
 						: namelist.count() > 0 ? namelist[0] : "";
 				this->setVariant(n);
@@ -115,7 +115,7 @@ DataTableAction::~DataTableAction()
 {
 }
 
-bool DataTableAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const QString& name)
+bool DataTableAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
 {
 	kdDebug()<<"DataTableAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl;
 	/*
@@ -141,27 +141,27 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context)
 		return;
 	}
 
-	const QString method = context->variable("method")->variant().toString();
-	const QString type = context->variable("type")->variant().toString();
+	const TQString method = context->variable("method")->variant().toString();
+	const TQString type = context->variable("type")->variant().toString();
 
-	const QString partitem = context->variable("partitem")->variant().toString();
-	QString identifier;
+	const TQString partitem = context->variable("partitem")->variant().toString();
+	TQString identifier;
 	if(! partitem.isEmpty()) {
-		QStringList parts = QStringList::split(".", partitem);
-		KexiPart::Part* part = Kexi::partManager().partForMimeType( QString("kexi/%1").arg(parts[0]) );
+		TQStringList parts = TQStringList::split(".", partitem);
+		KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(parts[0]) );
 		KexiPart::Item* item = part ? mainWin()->project()->item(part->info(), parts[1]) : 0;
 		if(! item)
-			throw KoMacro::Exception(i18n("No such item \"%1\"").arg(partitem));
-		identifier = QString::number(item->identifier());
+			throw KoMacro::Exception(i18n("No such item \"%1\"").tqarg(partitem));
+		identifier = TQString::number(item->identifier());
 	}
 
-	QMap<QString,QString> args;
+	TQMap<TQString,TQString> args;
 	if(! identifier.isNull())
 		args.insert("itemId", identifier);
 
 	if(method == "import") {
 		args.insert("sourceType", type);
-		QDialog *dlg = KexiInternalPart::createModalDialogInstance(
+		TQDialog *dlg = KexiInternalPart::createModalDialogInstance(
 			"csv_importexport", "KexiCSVImportDialog", 0, mainWin(), 0, &args);
 		if (!dlg)
 			return; //error msg has been shown by KexiInternalPart
@@ -170,7 +170,7 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context)
 	}
 	else if(method == "export") {
 		args.insert("destinationType", type);
-		QDialog *dlg = KexiInternalPart::createModalDialogInstance(
+		TQDialog *dlg = KexiInternalPart::createModalDialogInstance(
 			"csv_importexport", "KexiCSVExportWizard", 0, mainWin(), 0, &args);
 		if (!dlg)
 			return; //error msg has been shown by KexiInternalPart
@@ -178,7 +178,7 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context)
 		delete dlg;
 	}
 	else {
-		throw KoMacro::Exception(i18n("No such method \"%1\"").arg(method));
+		throw KoMacro::Exception(i18n("No such method \"%1\"").tqarg(method));
 	}
 }