diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-05-09 15:19:44 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-05-09 15:19:44 +0200 |
| commit | 25fe483e16bfbee521731caa40ae2fea6f29af68 (patch) | |
| tree | 82c1978d0f7ab679f204bb94e496a22de9a28378 /part | |
| parent | d5bdad9b22c20c4d85b9a26f00e1ed8b137eb3f6 (diff) | |
| download | kxmleditor-25fe483e16bfbee521731caa40ae2fea6f29af68.tar.gz kxmleditor-25fe483e16bfbee521731caa40ae2fea6f29af68.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 <slavek.banko@axis.cz>
Diffstat (limited to 'part')
| -rw-r--r-- | part/kxedocument.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/part/kxedocument.cpp b/part/kxedocument.cpp index c990d10..5bba469 100644 --- a/part/kxedocument.cpp +++ b/part/kxedocument.cpp @@ -106,7 +106,7 @@ bool KXEDocument::save(const TQString &strFileName) if(strEncoding.length() <= 0) pTextCodec = TQTextCodec::codecForLocale(); // default else - pTextCodec = TQTextCodec::codecForName(strEncoding); + pTextCodec = TQTextCodec::codecForName(strEncoding.latin1()); if(pTextCodec == 0) { if(KMessageBox::questionYesNo(0, i18n("Codec for encoding %1 not found ! Continue saving ?").arg(strEncoding)) != KMessageBox::Yes) @@ -222,7 +222,7 @@ bool KXEDocument::open(const TQString &strFileName) { line = stream.readLine(); // line of text excluding '\n' //printf( "%3d: %s\n", i++, line.latin1() ); - fileTemporary.writeBlock(line, line.length()); + fileTemporary.writeBlock(line.utf8(), line.utf8().length()); } pIODevice->close(); } @@ -244,7 +244,7 @@ bool KXEDocument::open(const TQString &strFileName) // For KOffice files let user to choose maindoc or documentinfo if(strCompressedTarEntryName.length() == 0) - { KXEChooseStringDialog dlgChooseString(0, 0, i18n("Choose file"), i18n("File:")); + { KXEChooseStringDialog dlgChooseString(0, 0, i18n("Choose file").utf8(), i18n("File:").utf8()); dlgChooseString.m_pComboBox->insertItem("maindoc.xml"); dlgChooseString.m_pComboBox->insertItem("documentinfo.xml"); @@ -321,7 +321,7 @@ bool KXEDocument::open(const TQString &strFileName) { strEncoding = strFirstLine.mid(iStart, iEnd - iStart); - TQTextCodec *pTextCodec = TQTextCodec::codecForName(strEncoding); + TQTextCodec *pTextCodec = TQTextCodec::codecForName(strEncoding.latin1()); if(pTextCodec) txtStreamLocal.setCodec(pTextCodec); else |