diff options
| author |  Fabio Bas | 2023-10-04 11:25:05 +0200 |
|---|---|---|
| committer | ctrlaltca | 2023-10-18 10:26:35 +0200 |
| commit | 29e92a939647612842b2f583ce0a43dd572b1345 (patch) | |
| tree | be091f42ad1c2ff70d670bd8bba597b9bbf8aae1 /src/modules/classeditor | |
| parent | Qt6 is stricter when casting numericals and chars. Add an explicit cast/conve... (diff) | |
| download | KVIrc-29e92a939647612842b2f583ce0a43dd572b1345.tar.gz KVIrc-29e92a939647612842b2f583ce0a43dd572b1345.tar.bz2 KVIrc-29e92a939647612842b2f583ce0a43dd572b1345.zip | |
Port from QRegExp (unavailable on qt6) to KviRegExp, based on QRegularExpression
Method str_kvs_fnc_split() had to be replaced with the original version, since the newer one relied on Qt5's QStringRef
Diffstat (limited to 'src/modules/classeditor')
| -rw-r--r-- | src/modules/classeditor/ClassEditorWindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp index e0a55b972..c851cffdc 100644 --- a/src/modules/classeditor/ClassEditorWindow.cpp +++ b/src/modules/classeditor/ClassEditorWindow.cpp @@ -41,6 +41,7 @@ #include "KviKvsObjectController.h" #include "KviCommandFormatter.h" #include "KviModule.h" +#include "KviRegExp.h" #include "KviTalVBox.h" #include "kvi_fileextensions.h" #include "KviModuleManager.h" @@ -53,7 +54,6 @@ #include <QDir> #include <QMessageBox> #include <QInputDialog> -#include <QRegExp> #include <QMouseEvent> #include <QPainter> #include <QBrush> @@ -1518,7 +1518,7 @@ bool ClassEditorWidget::askForNamespaceName(const QString & szAction, const QStr } // we allow only [\w:]+ - QRegExp re("[\\w:]+"); + KviRegExp re("[\\w:]+"); if(!re.exactMatch(szNewName)) { g_pClassEditorModule->lock(); @@ -1934,7 +1934,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz m_pClassNameLineEdit->setObjectName("classnameineedit"); m_pClassNameLineEdit->setText(szClassName); pLabel->setBuddy(m_pClassNameLineEdit); - QRegExp re; + KviRegExp re; if(!bRenameMode) { // we allow only [\w:]+ class name @@ -1947,7 +1947,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz re.setPattern("[\\w]+(::[\\w]+)+"); m_pClassNameLineEdit->setToolTip(__tr2qs_ctx("In rename mode class names can contain only letters, digits and underscores and namespaces :: separator", "editor")); } - QRegExpValidator * pValidator = new QRegExpValidator(re, this); + QRegularExpressionValidator * pValidator = new QRegularExpressionValidator(re, this); m_pClassNameLineEdit->setValidator(pValidator); m_pClassNameLineEdit->setObjectName("functionameineedit"); @@ -2056,8 +2056,8 @@ KviClassEditorFunctionDialog::KviClassEditorFunctionDialog(QWidget * pParent, co m_pFunctionNameLineEdit = new QLineEdit(pHBox); // we allow only [\w:]+ function name - QRegExp re("[\\w]+"); - QRegExpValidator * pValidator = new QRegExpValidator(re, this); + KviRegExp re("[\\w]+"); + QRegularExpressionValidator * pValidator = new QRegularExpressionValidator(re, this); m_pFunctionNameLineEdit->setValidator(pValidator); m_pFunctionNameLineEdit->setObjectName("functionameineedit"); m_pFunctionNameLineEdit->setToolTip(__tr2qs_ctx("Function names can contain only letters, digits and underscores", "editor")); |