diff options
| author |  wodim | 2017-09-06 01:03:57 +0200 |
|---|---|---|
| committer | wodim | 2017-09-06 01:03:57 +0200 |
| commit | e7e2f4048920ca2da10ccb5c1b00781fcd895d39 (patch) | |
| tree | a54b292dc6b1b103f1c86ed3514c07609da6db23 | |
| parent | OptionsWidget_message: fix label text "Use specified smart colors for own nic... (diff) | |
| download | KVIrc-e7e2f4048920ca2da10ccb5c1b00781fcd895d39.tar.gz KVIrc-e7e2f4048920ca2da10ccb5c1b00781fcd895d39.tar.bz2 KVIrc-e7e2f4048920ca2da10ccb5c1b00781fcd895d39.zip | |
Revert "Escape things in the class editor. Fixes #2211. (#2243)"
This reverts commit 549d6f1a78a66ad3ee31a5d957e26fb06b03f95c.
| -rw-r--r-- | src/kvirc/kvs/object/KviKvsObjectClass.cpp | 5 | ||||
| -rw-r--r-- | src/modules/classeditor/ClassEditorWindow.cpp | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/kvirc/kvs/object/KviKvsObjectClass.cpp b/src/kvirc/kvs/object/KviKvsObjectClass.cpp index fae3d0733..b900689b6 100644 --- a/src/kvirc/kvs/object/KviKvsObjectClass.cpp +++ b/src/kvirc/kvs/object/KviKvsObjectClass.cpp @@ -193,15 +193,12 @@ bool KviKvsObjectClass::save(const QString & szFileName) { if(h->isScriptHandler() && !h->isClone()) { - QString reminder = h->reminder(); - KviQString::escapeKvs(&reminder); - szBuffer += " "; if(h->flags() & KviKvsObjectFunctionHandler::Internal) szBuffer += "internal "; szBuffer += "function "; szBuffer += it.currentKey(); - szBuffer += "(\"" + reminder + "\")\n"; + szBuffer += "(" + h->reminder() + ")\n"; QString szCode = h->scriptHandlerCode(); KviCommandFormatter::blockFromBuffer(szCode); KviCommandFormatter::indent(szCode); diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp index 8f9c5d1bb..cee1e3d8c 100644 --- a/src/modules/classeditor/ClassEditorWindow.cpp +++ b/src/modules/classeditor/ClassEditorWindow.cpp @@ -808,7 +808,7 @@ void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetI { QString szReminderText = __tr2qs_ctx("Reminder text.", "editor"); szReminderText += ": <b>"; - szReminderText += m_pLastEditedItem->reminder().toHtmlEscaped(); + szReminderText += m_pLastEditedItem->reminder(); szReminderText += "</b>"; m_pReminderLabel->setText(szReminderText); m_pReminderLabel->show(); @@ -1054,15 +1054,12 @@ void ClassEditorWidget::exportClassBuffer(QString & szBuffer, ClassEditorTreeWid ClassEditorTreeWidgetItem * pFunction = (ClassEditorTreeWidgetItem *)pItem->child(i); if(pFunction->isMethod()) { - QString reminder = pFunction->reminder(); - KviQString::escapeKvs(&reminder); - szBuffer += "\t"; if(pFunction->isInternalFunction()) szBuffer += "internal "; szBuffer += "function "; szBuffer += pFunction->name(); - szBuffer += "(\"" + reminder + "\")\n"; + szBuffer += "(" + pFunction->reminder() + ")\n"; QString szCode = pFunction->buffer(); KviCommandFormatter::blockFromBuffer(szCode); KviCommandFormatter::indent(szCode); |