diff options
| author | Slávek Banko <[email protected]> | 2020-11-02 22:33:43 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2020-11-05 18:50:24 +0100 |
| commit | aca58384d909cd450bae59a6f46679d8cbb3606a (patch) | |
| tree | 570e5f599175ac15434d0c87a5a4173a3ade0c55 /src/itemdocumentdata.cpp | |
| parent | 26de10618a0767658160762b87f1ec2c9c1cbc26 (diff) | |
| download | ktechlab-aca58384d909cd450bae59a6f46679d8cbb3606a.tar.gz ktechlab-aca58384d909cd450bae59a6f46679d8cbb3606a.zip | |
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 2c73ccdf45212ab2a43582955be0eff21c70f971)
Diffstat (limited to 'src/itemdocumentdata.cpp')
| -rw-r--r-- | src/itemdocumentdata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |