diff options
| author |  Fabio Bas | 2023-10-04 22:50:00 +0200 |
|---|---|---|
| committer | ctrlaltca | 2023-10-18 10:26:35 +0200 |
| commit | b62b83e7772e9fba12fd6eadb6c1e70924ccf173 (patch) | |
| tree | 768534de16817dadabf5f9a9f8005558f9201a9d /src/modules/objects/KvsObject_multiLineEdit.cpp | |
| parent | Make shortcuts compatible with qt6; remove unused KviShortcut constructor sin... (diff) | |
| download | KVIrc-b62b83e7772e9fba12fd6eadb6c1e70924ccf173.tar.gz KVIrc-b62b83e7772e9fba12fd6eadb6c1e70924ccf173.tar.bz2 KVIrc-b62b83e7772e9fba12fd6eadb6c1e70924ccf173.zip | |
Misc Qt6 port for slightly changed class names and method signatures
Diffstat (limited to 'src/modules/objects/KvsObject_multiLineEdit.cpp')
| -rw-r--r-- | src/modules/objects/KvsObject_multiLineEdit.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/modules/objects/KvsObject_multiLineEdit.cpp b/src/modules/objects/KvsObject_multiLineEdit.cpp index 19ddb0f84..9d65435f5 100644 --- a/src/modules/objects/KvsObject_multiLineEdit.cpp +++ b/src/modules/objects/KvsObject_multiLineEdit.cpp @@ -403,7 +403,11 @@ bool KvsObject_textedit::functionText(KviKvsObjectFunctionCall * c) bool KvsObject_textedit::functionHtml(KviKvsObjectFunctionCall * c) { if(widget()) +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) c->returnValue()->setString(((QTextEdit *)widget())->document()->toHtml(QByteArray("utf-8"))); +#else + c->returnValue()->setString(((QTextEdit *)widget())->document()->toHtml()); +#endif return true; } @@ -823,7 +827,11 @@ bool KvsObject_textedit::functionsaveFile(KviKvsObjectFunctionCall * c) KVSO_PARAMETERS_END(c) if (KviQString::equalCI(szFormat, "html")) +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) szData = ((QTextEdit *)widget())->document()->toHtml(QByteArray("utf-8")); +#else + szData = ((QTextEdit *)widget())->document()->toHtml(); +#endif else { if (!szFormat.isEmpty() && !KviQString::equalCI(szFormat, "text")) c->warning(__tr2qs_ctx("Unknown text document format '%Q'. Writing the document as plain text.", "objects"), &szFormat); |