Remove additional unneeded tq method conversions

4 files changed, 43 insertions, 43 deletions

diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp
index 298363c4..c5368b26 100644
--- a/kexi/plugins/tables/kexitabledesignercommands.cpp
+++ b/kexi/plugins/tables/kexitabledesignercommands.cpp
@@ -72,8 +72,8 @@ ChangeFieldPropertyCommand::~ChangeFieldPropertyCommand()
 TQString ChangeFieldPropertyCommand::name() const
 {
 	return i18n("Change \"%1\" property for table field from \"%2\" to \"%3\"")
-		.tqarg(m_alterTableAction.propertyName()).tqarg(m_oldValue.toString())
-		.tqarg(m_alterTableAction.newValue().toString());
+		.arg(m_alterTableAction.propertyName()).arg(m_oldValue.toString())
+		.arg(m_alterTableAction.newValue().toString());
 }
 
 TQString ChangeFieldPropertyCommand::debugString()
@@ -81,15 +81,15 @@ TQString ChangeFieldPropertyCommand::debugString()
 	TQString s( name() );
 	if (m_oldListData || m_listData)
 		s += TQString("\nAnd list data from [%1]\n  to [%2]")
-			.tqarg( m_oldListData ? 
+			.arg( m_oldListData ? 
 				TQString("%1 -> %2")
-				.tqarg(m_oldListData->keysAsStringList().join(",")).tqarg(m_oldListData->names.join(","))
+				.arg(m_oldListData->keysAsStringList().join(",")).arg(m_oldListData->names.join(","))
 				: TQString("<NONE>"))
-			.tqarg( m_listData ?
+			.arg( m_listData ?
 				TQString("%1 -> %2")
-				.tqarg(m_listData->keysAsStringList().join(",")).tqarg(m_listData->names.join(","))
+				.arg(m_listData->keysAsStringList().join(",")).arg(m_listData->names.join(","))
 				: TQString("<NONE>"));
-	return s + TQString(" (UID=%1)").tqarg(m_alterTableAction.uid());
+	return s + TQString(" (UID=%1)").arg(m_alterTableAction.uid());
 }
 
 void ChangeFieldPropertyCommand::execute()
@@ -136,9 +136,9 @@ RemoveFieldCommand::~RemoveFieldCommand()
 TQString RemoveFieldCommand::name() const
 {
 	if (m_set)
-		return i18n("Remove table field \"%1\"").tqarg(m_alterTableAction.fieldName());
+		return i18n("Remove table field \"%1\"").arg(m_alterTableAction.fieldName());
 
-	return TQString("Remove empty row at position %1").tqarg(m_fieldIndex);
+	return TQString("Remove empty row at position %1").arg(m_fieldIndex);
 }
 
 void RemoveFieldCommand::execute()
@@ -161,7 +161,7 @@ TQString RemoveFieldCommand::debugString()
 
 	return name() + "\nAT ROW " + TQString::number(m_fieldIndex)
 		+ ", FIELD: " + (*m_set)["caption"].value().toString()
-		+ TQString(" (UID=%1)").tqarg(m_alterTableAction.uid());
+		+ TQString(" (UID=%1)").arg(m_alterTableAction.uid());
 }
 
 KexiDB::AlterTableHandler::ActionBase* RemoveFieldCommand::createAction()
@@ -192,7 +192,7 @@ InsertFieldCommand::~InsertFieldCommand()
 
 TQString InsertFieldCommand::name() const
 {
-	return i18n("Insert table field \"%1\"").tqarg(m_set["caption"].value().toString());
+	return i18n("Insert table field \"%1\"").arg(m_set["caption"].value().toString());
 }
 
 void InsertFieldCommand::execute()
@@ -229,9 +229,9 @@ ChangePropertyVisibilityCommand::~ChangePropertyVisibilityCommand()
 TQString ChangePropertyVisibilityCommand::name() const
 {
 	return TQString("[internal] Change \"%1\" visibility from \"%2\" to \"%3\"")
-		.tqarg(m_alterTableAction.propertyName())
-		.tqarg(m_oldVisibility ? "true" : "false")
-		.tqarg(m_alterTableAction.newValue().toBool() ? "true" : "false");
+		.arg(m_alterTableAction.propertyName())
+		.arg(m_oldVisibility ? "true" : "false")
+		.arg(m_alterTableAction.newValue().toBool() ? "true" : "false");
 }
 
 void ChangePropertyVisibilityCommand::execute()
@@ -265,7 +265,7 @@ InsertEmptyRowCommand::~InsertEmptyRowCommand()
 
 TQString InsertEmptyRowCommand::name() const
 {
-	return TQString("Insert empty row at position %1").tqarg(m_row);
+	return TQString("Insert empty row at position %1").arg(m_row);
 }
 
 void InsertEmptyRowCommand::execute()
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 190e9834..ea337d36 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -495,11 +495,11 @@ void KexiTableDesignerView::slotTogglePrimaryKey()
 /*	CommandGroup *setPrimaryKeyCommand;
 	if (isSet) {
 		setPrimaryKeyCommand = new CommandGroup(i18n("Set primary key for field \"%1\"")
-			.tqarg(set["name"].value().toString()) );
+			.arg(set["name"].value().toString()) );
 	}
 	else {
 		setPrimaryKeyCommand = new CommandGroup(i18n("Unset primary key for field \"%1\"")
-			.tqarg(set["name"].value().toString()) );
+			.arg(set["name"].value().toString()) );
 	}
 	switchPrimaryKey(set, isSet, false, setPrimaryKeyCommand);*/
 	//addHistoryCommand( setPrimaryKeyCommand, false /* !execute */ );
@@ -687,8 +687,8 @@ void KexiTableDesignerView::slotBeforeCellChanged(
 				//remember this action containing 2 subactions
 				CommandGroup *changeCaptionAndNameCommand = new CommandGroup(
 					i18n("Change \"%1\" field's name to \"%2\" and caption from \"%3\" to \"%4\"")
-						.tqarg(oldName).tqarg(propertySetForItem->property("name").value().toString())
-						.tqarg(oldCaption).tqarg(newValue.toString() ));
+						.arg(oldName).arg(propertySetForItem->property("name").value().toString())
+						.arg(oldCaption).arg(newValue.toString() ));
 				changeCaptionAndNameCommand->addCommand( changeCaptionCommand );
 //					new ChangeFieldPropertyCommand( this, *propertySetForItem,
 	//						"caption", oldCaption, newValue)
@@ -759,7 +759,7 @@ void KexiTableDesignerView::slotBeforeCellChanged(
 		// *** this action contains subactions ***
 		CommandGroup *changeDataTypeCommand = new CommandGroup(
 			i18n("Change data type for field \"%1\" to \"%2\"")
-				.tqarg(set["name"].value().toString()).tqarg( KexiDB::Field::typeName( fieldType ) ) );
+				.arg(set["name"].value().toString()).arg( KexiDB::Field::typeName( fieldType ) ) );
 
 //kexipluginsdbg << "++++++++++" << slist << nlist << endl;
 
@@ -968,13 +968,13 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 				//switchPrimaryKey(set, true);
 				// this will be toplevel command 
 				setAutonumberCommand = new CommandGroup(
-					i18n("Assign autonumber for field \"%1\"").tqarg(set["name"].value().toString()) );
+					i18n("Assign autonumber for field \"%1\"").arg(set["name"].value().toString()) );
 				toplevelCommand = setAutonumberCommand;
 				d->setPropertyValueIfNeeded( set, "autoIncrement", TQVariant(true,1), setAutonumberCommand );
 			}
 			else {
 				setAutonumberCommand = new CommandGroup(
-					i18n("Remove autonumber from field \"%1\"").tqarg(set["name"].value().toString()) );
+					i18n("Remove autonumber from field \"%1\"").arg(set["name"].value().toString()) );
 				//d->slotPropertyChanged_enabled = false;
 //					set["autoIncrement"].setValue( TQVariant(false,1), false/*don't save old*/);
 //					d->slotPropertyChanged_enabled = true;
@@ -995,7 +995,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 		setPrimaryKey = false;
 		// this will be toplevel command 
 		CommandGroup *unsetIndexedOrUniquOrNotNullCommand = new CommandGroup(
-			i18n("Set \"%1\" property for field \"%2\"").tqarg(property.caption()).tqarg(set["name"].value().toString()) );
+			i18n("Set \"%1\" property for field \"%2\"").arg(property.caption()).arg(set["name"].value().toString()) );
 		toplevelCommand = unsetIndexedOrUniquOrNotNullCommand;
 		d->setPropertyValueIfNeeded( set, pname, TQVariant(false,1), unsetIndexedOrUniquOrNotNullCommand );
 		if (pname=="notNull") {
@@ -1040,8 +1040,8 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 //		kdDebug() << set["type"].value() << endl;
 //		if (KexiDB::Field::typeGroup( set["type"].value().toInt() ) == (int)KexiDB::Field::TextGroup) {
 		CommandGroup* changeFieldTypeCommand = new CommandGroup(
-			i18n("Change type for field \"%1\" to \"%2\"").tqarg(set["name"].value().toString())
-			.tqarg(typeName) );
+			i18n("Change type for field \"%1\" to \"%2\"").arg(set["name"].value().toString())
+			.arg(typeName) );
 		d->setPropertyValueIfNeeded( set, "subType", property.value(), property.oldValue(),
 			changeFieldTypeCommand );
 
@@ -1085,7 +1085,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 			//this action contains subactions
 			CommandGroup *setPrimaryKeyCommand = new CommandGroup(
 				i18n("Set primary key for field \"%1\"")
-					.tqarg(set["name"].value().toString()) );
+					.arg(set["name"].value().toString()) );
 			if (toplevelCommand)
 				toplevelCommand->addCommand( setPrimaryKeyCommand );
 			else
@@ -1111,7 +1111,7 @@ void KexiTableDesignerView::slotPropertyChanged(KoProperty::Set& set, KoProperty
 			//remember this action containing 2 subactions
 			CommandGroup *setPrimaryKeyCommand = new CommandGroup(
 				i18n("Unset primary key for field \"%1\"")
-					.tqarg(set["name"].value().toString()) );
+					.arg(set["name"].value().toString()) );
 			if (toplevelCommand)
 				toplevelCommand->addCommand( setPrimaryKeyCommand );
 			else
@@ -1147,10 +1147,10 @@ void KexiTableDesignerView::slotRowInserted()
 }
 
 void KexiTableDesignerView::slotAboutToDeleteRow(
-	KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint)
+	KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint)
 {
 	Q_UNUSED(result)
-	Q_UNUSED(tqrepaint)
+	Q_UNUSED(repaint)
 	if (item[COLUMN_ID_ICON].toString()=="key")
 		d->primaryKeyExists = false;
 
@@ -1213,7 +1213,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 				"for creating relations between database tables. "
 				"Do you want to add primary key automatically now?</p>"
 				"<p>If you want to add a primary key by hand, press \"Cancel\" "
-				"to cancel saving table design.</p>").tqarg(schema.name()),
+				"to cancel saving table design.</p>").arg(schema.name()),
 				TQString(), KGuiItem(i18n("&Add Primary Key"), "key"), KStdGuiItem::no(),
 					"autogeneratePrimaryKeysOnTableDesignSaving");
 			if (questionRes==KMessageBox::Cancel) {
@@ -1229,9 +1229,9 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 					KoProperty::Set *set = d->sets->at(i);
 					if (set) {
 						if ((*set)["name"].value().toString()
-							== pkFieldName.tqarg(idIndex==1?TQString() : TQString::number(idIndex))
+							== pkFieldName.arg(idIndex==1?TQString() : TQString::number(idIndex))
 						|| (*set)["caption"].value().toString()
-							== pkFieldCaption.tqarg(idIndex==1?TQString() : TQString::number(idIndex)))
+							== pkFieldCaption.arg(idIndex==1?TQString() : TQString::number(idIndex)))
 						{
 							//try next id index
 							i = 0;
@@ -1241,8 +1241,8 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 					}
 					i++;
 				}
-				pkFieldName = pkFieldName.tqarg(idIndex==1?TQString() : TQString::number(idIndex));
-				pkFieldCaption = pkFieldCaption.tqarg(idIndex==1?TQString() : TQString::number(idIndex));
+				pkFieldName = pkFieldName.arg(idIndex==1?TQString() : TQString::number(idIndex));
+				pkFieldCaption = pkFieldCaption.arg(idIndex==1?TQString() : TQString::number(idIndex));
 				//ok, add PK with such unique name
 				d->view->insertEmptyRow(0);
 				d->view->setCursorPosition(0, COLUMN_ID_CAPTION);
@@ -1273,7 +1273,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 				if (beSilent) {
 					kexipluginswarn << 
 						TQString("KexiTableDesignerView::buildSchema(): no field caption entered at row %1...")
-						.tqarg(i+1) << endl;
+						.arg(i+1) << endl;
 				}
 				else {
 					d->view->setCursorPosition(i, COLUMN_ID_CAPTION);
@@ -1304,7 +1304,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 		if (beSilent) {
 			kexipluginswarn << 
 				TQString("KexiTableDesignerView::buildSchema(): duplicated field name '%1'")
-				.tqarg((*b)["name"].value().toString()) << endl;
+				.arg((*b)["name"].value().toString()) << endl;
 		}
 		else {
 			d->view->setCursorPosition(i, COLUMN_ID_CAPTION);
@@ -1313,7 +1313,7 @@ tristate KexiTableDesignerView::buildSchema(KexiDB::TableSchema &schema, bool be
 			KMessageBox::sorry(this,
 				i18n("You have added \"%1\" field name twice.\nField names cannot be repeated. "
 				"Correct name of the field.")
-				.tqarg((*b)["name"].value().toString()) );
+				.arg((*b)["name"].value().toString()) );
 		}
 		res = cancelled;
 	}
@@ -1457,7 +1457,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 			this, *conn, *tempData()->table,
 			i18n("You are about to change the design of table \"%1\" "
 			"but following objects using this table are opened:")
-			.tqarg(tempData()->table->name()));
+			.arg(tempData()->table->name()));
 	}
 
 	if (res == true) {
@@ -1659,7 +1659,7 @@ void KexiTableDesignerView::slotAboutToShowContextMenu()
 		if (captionOrName.isEmpty())
 			captionOrName = set["name"].value().toString();
 //! @todo show "field" icon
-		d->contextMenuTitle->setTitle( i18n("Table field \"%1\"").tqarg(captionOrName) );
+		d->contextMenuTitle->setTitle( i18n("Table field \"%1\"").arg(captionOrName) );
 	}
 	else {
 		d->contextMenuTitle->setTitle( i18n("Empty table row", "Empty Row") );
diff --git a/kexi/plugins/tables/kexitabledesignerview.h b/kexi/plugins/tables/kexitabledesignerview.h
index 13ce495d..5b9d0215 100644
--- a/kexi/plugins/tables/kexitabledesignerview.h
+++ b/kexi/plugins/tables/kexitabledesignerview.h
@@ -146,10 +146,10 @@ class KexiTableDesignerView : public KexiDataTable, public KexiTableDesignerInte
 
 		//! Called before row inserting in tableview.
 		void slotRowInserted();
-//		void slotAboutToInsertRow(KexiTableItem* item, KexiDB::ResultInfo* result, bool tqrepaint);
+//		void slotAboutToInsertRow(KexiTableItem* item, KexiDB::ResultInfo* result, bool repaint);
 
 		//! Called before row deleting in tableview.
-		void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool tqrepaint);
+		void slotAboutToDeleteRow(KexiTableItem& item, KexiDB::ResultInfo* result, bool repaint);
 
 		/*! Called after any property has been changed in the current property set,
 		 to perform some actions (like updating other dependent properties) */
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 4efd237a..55c8be5d 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -137,7 +137,7 @@ bool KexiTablePart::remove(KexiMainWindow *win, KexiPart::Item &item)
 		tristate res = KexiTablePart::askForClosingObjectsUsingTableSchema(
 			win, *conn, *sch, 
 			i18n("You are about to remove table \"%1\" but following objects using this table are opened:")
-			.tqarg(sch->name()));
+			.arg(sch->name()));
 		return true == conn->dropTable( sch );
 	}
 	//last chance: just remove item
@@ -182,7 +182,7 @@ tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *parent, K
 	TQString openedObjectsStr = "<ul>";
 	for (TQPtrListIterator<KexiDB::Connection::TableSchemaChangeListenerInterface> it(*listeners);
 		it.current(); ++it)	{
-			openedObjectsStr += TQString("<li>%1</li>").tqarg(it.current()->listenerInfoString);
+			openedObjectsStr += TQString("<li>%1</li>").arg(it.current()->listenerInfoString);
 	}
 	openedObjectsStr += "</ul>";
 	int r = KMessageBox::questionYesNo(parent,