From aca58384d909cd450bae59a6f46679d8cbb3606a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 2 Nov 2020 22:33:43 +0100 Subject: Added controlled conversions to char* instead of automatic ascii conversions. The definition of -UTQT_NO_ASCII_CAST is no longer needed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 2c73ccdf45212ab2a43582955be0eff21c70f971) --- src/itemdocumentdata.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/itemdocumentdata.cpp') diff --git a/src/itemdocumentdata.cpp b/src/itemdocumentdata.cpp index c0efc5d..669d1c8 100644 --- a/src/itemdocumentdata.cpp +++ b/src/itemdocumentdata.cpp @@ -683,7 +683,7 @@ void ItemDocumentData::elementToConnectorData( TQDomElement element ) ConnectorData connectorData; - connectorData.manualRoute = element.attribute( "manual-route", "0" ); + connectorData.manualRoute = element.attribute("manual-route", "0").toInt(); TQString route = element.attribute( "route", "" ); TQStringList points = TQStringList::split( ",", route ); @@ -992,7 +992,7 @@ void ItemDocumentData::mergeWithDocument( ItemDocument *itemDocument, bool selec { if ( !it.data().type.isEmpty() && !itemDocument->itemWithID( it.key() ) ) { - Item *item = itemLibrary()->createItem( it.data().type, itemDocument, false, it.key(), false ); + Item *item = itemLibrary()->createItem(it.data().type, itemDocument, false, it.key().utf8(), false); if ( item && !itemDocument->isValidItem(item) ) { kdWarning() << "Attempted to create invalid item with id: " << it.key() << endl; -- cgit v1.2.1