Remove additional unneeded tq method conversions

6 files changed, 19 insertions, 19 deletions

diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp
index d2eb1df1..19922122 100644
--- a/kexi/plugins/macros/kexiactions/datatableaction.cpp
+++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp
@@ -148,10 +148,10 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context)
 	TQString identifier;
 	if(! partitem.isEmpty()) {
 		TQStringList parts = TQStringList::split(".", partitem);
-		KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(parts[0]) );
+		KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").arg(parts[0]) );
 		KexiPart::Item* item = part ? mainWin()->project()->item(part->info(), parts[1]) : 0;
 		if(! item)
-			throw KoMacro::Exception(i18n("No such item \"%1\"").tqarg(partitem));
+			throw KoMacro::Exception(i18n("No such item \"%1\"").arg(partitem));
 		identifier = TQString::number(item->identifier());
 	}
 
@@ -178,7 +178,7 @@ void DataTableAction::activate(KSharedPtr<KoMacro::Context> context)
 		delete dlg;
 	}
 	else {
-		throw KoMacro::Exception(i18n("No such method \"%1\"").tqarg(method));
+		throw KoMacro::Exception(i18n("No such method \"%1\"").arg(method));
 	}
 }
 
diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp
index ccad645c..564b03c8 100644
--- a/kexi/plugins/macros/kexiactions/executeaction.cpp
+++ b/kexi/plugins/macros/kexiactions/executeaction.cpp
@@ -77,17 +77,17 @@ void ExecuteAction::activate(KSharedPtr<KoMacro::Context> context)
 		return;
 	}
 
-	const TQString mimetype = TQString("kexi/%1").tqarg( context->variable("object")->variant().toString() );
+	const TQString mimetype = TQString("kexi/%1").arg( 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\"").tqarg(mimetype));
+		throw KoMacro::Exception(i18n("No such mimetype \"%1\"").arg(mimetype));
 	}
 
 	KexiPart::Item* item = mainWin()->project()->item(part->info(), name);
 	if(! item) {
-		throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").tqarg(name).tqarg(mimetype));
+		throw KoMacro::Exception(i18n("Failed to open part \"%1\" for mimetype \"%2\"").arg(name).arg(mimetype));
 	}
 
 	part->execute(item);
diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp
index bc573d10..815b8723 100644
--- a/kexi/plugins/macros/kexiactions/navigateaction.cpp
+++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp
@@ -111,13 +111,13 @@ void NavigateAction::activate(KSharedPtr<KoMacro::Context> context)
 
 	KexiViewBase* view = dialog->selectedView();
 	if(! view) {
-		throw KoMacro::Exception(i18n("No view selected for \"%1\".").tqarg(dialog->caption()));
+		throw KoMacro::Exception(i18n("No view selected for \"%1\".").arg(dialog->caption()));
 	}
 
 	KexiDataAwareView* dbview = dynamic_cast<KexiDataAwareView*>( view );
 	KexiDataAwareObjectInterface* dbobj = dbview ? dbview->dataAwareObject() : 0;
 	if(! dbview) {
-		throw KoMacro::Exception(i18n("The view for \"%1\" could not handle data.").tqarg(dialog->caption()));
+		throw KoMacro::Exception(i18n("The view for \"%1\" could not handle data.").arg(dialog->caption()));
 	}
 
 	const TQString record = context->variable("record")->variant().toString();
@@ -151,7 +151,7 @@ void NavigateAction::activate(KSharedPtr<KoMacro::Context> context)
 		void sortAscending();
 		void sortDescending();
 		*/
-		throw KoMacro::Exception(i18n("Unknown record \"%1\" in view for \"%2\".").tqarg(record).tqarg(dialog->caption()));
+		throw KoMacro::Exception(i18n("Unknown record \"%1\" in view for \"%2\".").arg(record).arg(dialog->caption()));
 	}
 }
 
diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h
index 419e2b00..1a0aabf8 100644
--- a/kexi/plugins/macros/kexiactions/objectnamevariable.h
+++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h
@@ -49,7 +49,7 @@ namespace KexiMacro {
 					return;
 
 				TQStringList namelist;
-				KexiPart::Info* info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").tqarg(objectname) );
+				KexiPart::Info* info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").arg(objectname) );
 				if(info) {
 					KexiPart::ItemDict* items = actionimpl->mainWin()->project()->items(info);
 					if(items)
@@ -65,7 +65,7 @@ namespace KexiMacro {
 
 				this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name );
 
-				kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" tqchildren="<<namelist<<endl;
+				kdDebug()<<"##################### KexiActions::ObjectNameVariable() objectname="<<objectname<<" name="<<name<<" value="<<this->variant()<<" children="<<namelist<<endl;
 			}
 
 			virtual ~ObjectNameVariable() {}
diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h
index 83a7a471..c27f024b 100644
--- a/kexi/plugins/macros/kexiactions/objectvariable.h
+++ b/kexi/plugins/macros/kexiactions/objectvariable.h
@@ -72,8 +72,8 @@ namespace KexiMacro {
 
 				if(! objectname.isNull())
 					this->setVariant( objectname );
-				else if(this->tqchildren().count() > 0)
-					this->setVariant( this->tqchildren()[0]->variant() );
+				else if(this->children().count() > 0)
+					this->setVariant( this->children()[0]->variant() );
 				else
 					this->setVariant( TQString() );
 
diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp
index 9cd2e664..d7c4e7aa 100644
--- a/kexi/plugins/macros/kexiactions/openaction.cpp
+++ b/kexi/plugins/macros/kexiactions/openaction.cpp
@@ -53,7 +53,7 @@ namespace KexiMacro {
 				: KexiVariable<ACTIONIMPL>(actionimpl, VIEW, i18n("View"))
 			{
 				TQStringList namelist;
-				KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").tqarg(objectname) );
+				KexiPart::Part* part = Kexi::partManager().partForMimeType( TQString("kexi/%1").arg(objectname) );
 				if(part) {
 					int viewmodes = part->supportedViewModes();
 					if(viewmodes & Kexi::DataViewMode)
@@ -63,7 +63,7 @@ namespace KexiMacro {
 					if(viewmodes & Kexi::TextViewMode)
 						namelist << TEXTVIEW;
 					for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
-						this->tqchildren().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
+						this->children().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
 				}
 				const TQString n =
 					namelist.contains(viewname)
@@ -124,9 +124,9 @@ void OpenAction::activate(KSharedPtr<KoMacro::Context> context)
 
 	const TQString objectname = context->variable(OBJECT)->variant().toString();
 	const TQString name = context->variable(NAME)->variant().toString();
-	KexiPart::Item* item = mainWin()->project()->itemForMimeType( TQString("kexi/%1").tqarg(objectname).latin1(), name );
+	KexiPart::Item* item = mainWin()->project()->itemForMimeType( TQString("kexi/%1").arg(objectname).latin1(), name );
 	if(! item) {
-		throw KoMacro::Exception(i18n("No such object \"%1.%2\".").tqarg(objectname).tqarg(name));
+		throw KoMacro::Exception(i18n("No such object \"%1.%2\".").arg(objectname).arg(name));
 	}
 
 	// Determinate the viewmode.
@@ -139,14 +139,14 @@ void OpenAction::activate(KSharedPtr<KoMacro::Context> context)
 	else if(view == TEXTVIEW)
 		viewmode = Kexi::TextViewMode;
 	else {
-		throw KoMacro::Exception(i18n("No such viewmode \"%1\" in object \"%2.%3\".").tqarg(view).tqarg(objectname).tqarg(name));
+		throw KoMacro::Exception(i18n("No such viewmode \"%1\" in object \"%2.%3\".").arg(view).arg(objectname).arg(name));
 	}
 
 	// Try to open the object now.
 	bool openingCancelled;
 	if(! mainWin()->openObject(item, viewmode, openingCancelled)) {
 		if(! openingCancelled) {
-			throw KoMacro::Exception(i18n("Failed to open object \"%1.%2\".").tqarg(objectname).tqarg(name));
+			throw KoMacro::Exception(i18n("Failed to open object \"%1.%2\".").arg(objectname).arg(name));
 		}
 	}
 }