From f0de9e167e289ab7dc33e57f077c1f04ec7c68c8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:38:41 -0600 Subject: Remove additional unneeded tq method conversions --- kexi/plugins/macros/kexiactions/datatableaction.cpp | 6 +++--- kexi/plugins/macros/kexiactions/executeaction.cpp | 6 +++--- kexi/plugins/macros/kexiactions/navigateaction.cpp | 6 +++--- kexi/plugins/macros/kexiactions/objectnamevariable.h | 4 ++-- kexi/plugins/macros/kexiactions/objectvariable.h | 4 ++-- kexi/plugins/macros/kexiactions/openaction.cpp | 12 ++++++------ 6 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kexi/plugins/macros/kexiactions') 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 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 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 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 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( 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 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="<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(new KoMacro::Variable(*it)) ); + this->children().append( KSharedPtr(new KoMacro::Variable(*it)) ); } const TQString n = namelist.contains(viewname) @@ -124,9 +124,9 @@ void OpenAction::activate(KSharedPtr 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 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)); } } } -- cgit v1.2.1