2 files changed, 10 insertions, 13 deletions

diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index 8f9c5d1bb..39c265341 100644
--- a/src/modules/classeditor/ClassEditorWindow.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -461,7 +461,7 @@ void ClassEditorWidget::createFullClass(KviKvsObjectClass * pClass, ClassEditorT
 
 bool ClassEditorWidget::hasSelectedItems()
 {
-	return m_pTreeWidget->selectedItems().count() ? 1 : 0;
+	return m_pTreeWidget->selectedItems().count() ? true : false;
 }
 
 bool ClassEditorWidget::classExists(QString & szFullItemName)
@@ -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);
@@ -2074,7 +2071,7 @@ KviClassEditorFunctionDialog::KviClassEditorFunctionDialog(QWidget * pParent, co
 
 	pLabel = new QLabel(pHBox);
 	pLabel->setObjectName("reminderlabel");
-	pLabel->setWordWrap(1);
+	pLabel->setWordWrap(true);
 	pLabel->setText(__tr2qs_ctx("Please enter the optional reminder string for the member function:", "editor"));
 
 	m_pReminderLineEdit = new QLineEdit(pHBox);
diff --git a/src/modules/classeditor/ClassEditorWindow.h b/src/modules/classeditor/ClassEditorWindow.h
index e12386a5e..c320937a2 100644
--- a/src/modules/classeditor/ClassEditorWindow.h
+++ b/src/modules/classeditor/ClassEditorWindow.h
@@ -73,7 +73,7 @@ public:
 	~ClassEditorTreeWidget();
 
 protected:
-	virtual void mousePressEvent(QMouseEvent * e);
+	void mousePressEvent(QMouseEvent * e) override;
 signals:
 	/**
 	* \brief Emitted when we press the mouse right button
@@ -305,14 +305,14 @@ public:
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void saveProperties(KviConfigurationFile * pCfg);
+	void saveProperties(KviConfigurationFile * pCfg);
 
 	/**
 	* \brief Called to load the window properties
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void loadProperties(KviConfigurationFile * pCfg);
+	void loadProperties(KviConfigurationFile * pCfg);
 
 	/**
 	* \brief Builds the class!
@@ -497,7 +497,7 @@ protected:
 	* \brief Returns the class editor small icon
 	* \return QPixmap *
 	*/
-	virtual QPixmap * myIconPtr();
+	QPixmap * myIconPtr() override;
 
 	/**
 	* \brief Sets the configuration group name as classeditor
@@ -511,14 +511,14 @@ protected:
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void saveProperties(KviConfigurationFile * pCfg);
+	void saveProperties(KviConfigurationFile * pCfg) override;
 
 	/**
 	* \brief Called to load the window properties
 	* \param pCfg The configuration file
 	* \return void
 	*/
-	virtual void loadProperties(KviConfigurationFile * pCfg);
+	void loadProperties(KviConfigurationFile * pCfg) override;
 protected slots:
 	/**
 	* \brief Called when we click the cancel button