move to QRegularExpression for all searches

Author: sunderme

src/buildmanager.cpp

@@ -1772,7 +1772,7 @@ void BuildManager::preview(const QString &preamble, const PreviewSource &source,
 	QStringList addPaths;
 	addPaths << masterDir;
 	if (preamble_mod.contains("\\usepackage{import}")) {
-		QStringList imports = regExpFindAllMatches(preamble_mod, QRegExp("\\\\subimport\\{([^}\n]*)\\}\\{[^}\n]*\\}"), 1);
+        QStringList imports = regularExpressionFindAllMatches(preamble_mod, QRegularExpression("\\\\subimport\\{([^}\n]*)\\}\\{[^}\n]*\\}"), 1);
 		imports.sort();
 		for (int i = imports.size() - 1; i > 0; i--)
 			if (imports[i] == imports[i - 1]) imports.removeAt(i);

src/qcodeedit/lib/document/qdocument.cpp

@@ -1608,10 +1608,11 @@ int QDocument::findLineContaining(const QString &searchText,  const int& startLi
 
 int QDocument::findLineRegExp(const QString &searchText,  const int& startLine, const Qt::CaseSensitivity cs, const bool wholeWord, const bool useRegExp) const{
 
-	QRegExp m_regexp=generateRegExp(searchText,cs==Qt::CaseSensitive,wholeWord,useRegExp);
+    QRegularExpression m_regexp=generateRegularExpression(searchText,cs==Qt::CaseSensitive,wholeWord,useRegExp);
 
 	for (int i=startLine;i<lines();i++){
-		if(m_regexp.indexIn(line(i).text(),0)>-1)
+        QRegularExpressionMatch match=m_regexp.match(line(i).text());
+        if(match.hasMatch())
 			return i;
 	}
 

src/qcodeedit/lib/document/qdocumentsearch.cpp

@@ -156,14 +156,10 @@ void QDocumentSearch::searchMatches(const QDocumentCursor& subHighlightScope, bo
 		l.setFlag(QDocumentLine::FormatsApplied, false);
 
 		const QString &s = boundaries.endLine != ln ? l.text() : l.text().left(boundaries.end);
-#if QT_VERSION > 0x050500
+
         QRegularExpressionMatch match=m_regularExpression.match(s, hc.columnNumber());
         int column = match.capturedStart();
         int length = match.capturedLength();
-#else
-		int column=m_regexp.indexIn(s, hc.columnNumber());
-		int length=m_regexp.matchedLength();
-#endif
 
 		/*
 		qDebug("searching %s in %s => %i",
@@ -209,18 +205,13 @@ void QDocumentSearch::searchMatches(const QDocumentCursor& subHighlightScope, bo
 			if((endOffset>=0)&&(i+1==endLine)){
 				txt=txt.left(endOffset);
 			}
-#if QT_VERSION > 0x050500
+
 			QRegularExpressionMatch match=m_regularExpression.match(txt,offset);
 			if(match.hasMatch()){
 				m_editor->addMarkDelayed(i,Qt::darkYellow,"search");
 				needsUpdate=true;
 			}
-#else
-			if(m_regexp.indexIn(txt,offset)>-1){
-				m_editor->addMarkDelayed(i,Qt::darkYellow,"search");
-				needsUpdate=true;
-			}
-#endif
+
 			offset=0;
 		}
 		if(needsUpdate)
@@ -290,7 +281,6 @@ void QDocumentSearch::recreateRegExp(){
 	    :
 	      Qt::CaseInsensitive;
 
-#if QT_VERSION >= 0x050500
     QRegularExpression::PatternOptions patternOption= cs==Qt::CaseInsensitive ? QRegularExpression::CaseInsensitiveOption : QRegularExpression::NoPatternOption ;
     patternOption |= QRegularExpression::UseUnicodePropertiesOption;
 	if ( hasOption(RegExp) )
@@ -303,23 +293,6 @@ void QDocumentSearch::recreateRegExp(){
 	} else {
 		m_regularExpression = QRegularExpression(QRegularExpression::escape(m_string), patternOption);
 	}
-#else
-	if ( hasOption(RegExp) )
-	{
-		m_regexp = QRegExp(m_string, cs, QRegExp::RegExp);
-	} else if ( hasOption(WholeWords) ) {
-		//todo: screw this? it prevents searching of "world!" and similar things
-		//(qtextdocument just checks the surrounding character when searching for whole words, this would also allow wholewords|regexp search)
-		m_regexp = QRegExp(
-		      QString("\\b%1\\b").arg(QRegExp::escape(m_string)),
-		      cs,
-		      QRegExp::RegExp
-		      );
-	} else {
-		m_regexp = QRegExp(m_string, cs, QRegExp::FixedString);
-	}
-	m_regexp.setMinimal( m_option & QDocumentSearch::NonGreedy); // allow greedy or non-greedy capture
-#endif
 }
 
 
@@ -492,15 +465,9 @@ QString QDocumentSearch::replaceTextExpanded() const
 	QString replacement = hasOption(EscapeSeq)?escapeCpp(m_replace):m_replace;
 
 	if (hasOption(RegExp))
-#if QT_VERSION>0x050500
 		for( int i=m_match.lastCapturedIndex();i >=0; --i )
 			replacement.replace(QString("\\") + QString::number(i),
 			                    m_match.captured(i));
-#else
-		for ( int i = m_regexp.captureCount(); i >= 0; --i )
-			replacement.replace(QString("\\") + QString::number(i),
-			                    m_regexp.cap(i));
-#endif
 
 	return replacement;
 }
@@ -614,8 +581,6 @@ int QDocumentSearch::next(bool backward, bool all, bool again, bool allowWrapAro
 	// replace
 	if (hasOption(Replace) && again && !all) {
 		bool replaceSelectedText = false;
-#if QT_VERSION > 0x050500
-        qDebug()<<m_match.hasMatch() << m_match.captured();
 		if (m_match.hasMatch() && m_match.captured()==m_cursor.selectedText())  {
 			replaceSelectedText = true;
 		} else if (m_regularExpression.pattern().contains("(?=") || m_regularExpression.pattern().contains("(?!")) {
@@ -637,28 +602,6 @@ int QDocumentSearch::next(bool backward, bool all, bool again, bool allowWrapAro
 				start = end;
 			}
 		}
-#else
-		if (m_regexp.exactMatch(m_cursor.selectedText()))  {
-			replaceSelectedText = true;
-		} else if (m_regexp.pattern().contains("(?=") || m_regexp.pattern().contains("(?!")) {
-			// special handling for lookahead: The selected text is not enough to match the regexp
-			// because the lookahead context is missing. Therefore we have to find matches to the
-			// whole line until we find the original selection. Only then, we know that the original
-			// selection is match and should be replaced.
-			int start = 0;
-			while (true) {
-				start = m_regexp.indexIn(m_cursor.line().text(), start);
-				if (start < 0)
-					break;
-				int end = start + m_regexp.matchedLength();
-				if ((start == m_cursor.startColumnNumber() && end == m_cursor.endColumnNumber()) ||
-				    (end == m_cursor.startColumnNumber() && start == m_cursor.endColumnNumber())) {
-					replaceSelectedText = true;
-				}
-				start = end;
-			}
-		}
-#endif
 		if (replaceSelectedText) {
 			replaceCursorText(backward);
 			updateReplacementOverlays();
@@ -759,7 +702,7 @@ int QDocumentSearch::next(bool backward, bool all, bool again, bool allowWrapAro
 
 		int column;
 		int length;
-#if QT_VERSION > 0x050500
+
 		if (backward) {
 			column=s.lastIndexOf(m_regularExpression,m_cursor.columnNumber()-coloffset,&m_match);
 			length=m_match.capturedLength();
@@ -769,13 +712,6 @@ int QDocumentSearch::next(bool backward, bool all, bool again, bool allowWrapAro
 			length=m_match.capturedLength();
 		}
 
-
-#else
-		if (backward) column=m_regexp.lastIndexIn(s,m_cursor.columnNumber()-coloffset);
-		else column=m_regexp.indexIn(s, m_cursor.columnNumber());
-		length=m_regexp.matchedLength();
-#endif
-
 		QDocumentCursor::MoveOperation nextMove = move;
 
 		bool matches = column != -1 && (backward || column >= m_cursor.columnNumber() );

src/qcodeedit/lib/document/qdocumentsearch.h

@@ -24,7 +24,6 @@
 */
 
 #include <QString>
-#include <QRegExp>
 #include <QRegularExpression>
 #include <QPointer>
 #include <QAbstractScrollArea>
@@ -105,7 +104,6 @@ class QCE_EXPORT QDocumentSearch: public QObject
 
 		void recreateRegExp();
 
-//		int m_index;
 		Options m_option;
 		QString m_string;
         QRegularExpression m_regularExpression;

src/searchresultmodel.cpp

@@ -313,21 +313,19 @@ QList<SearchMatch> SearchResultModel::getSearchMatches(const QDocumentLine &docl
 {
 	if (!docline.isValid() || mExpression.isEmpty()) return QList<SearchMatch>();
 
-	QRegExp regexp = generateRegExp(mExpression, mIsCaseSensitive, mIsWord, mIsRegExp);
+    QRegularExpression regexp = generateRegularExpression(mExpression, mIsCaseSensitive, mIsWord, mIsRegExp);
 	QString text = docline.text();
 
-	int i = 0;
 	QList<SearchMatch> result;
-	while (i < text.length()) {
-		i = regexp.indexIn(text, i);
-		if (i < 0) break;
-
-		SearchMatch match;
-		match.pos = i;
-		match.length = regexp.matchedLength();
-		result << match;
-        i+=match.length;
-	}
+    QRegularExpressionMatch re_match = regexp.match(text);
+    int offset=re_match.capturedStart();
+    while (offset > -1) {
+        SearchMatch match;
+        match.pos = offset;
+        match.length = re_match.capturedLength();
+        result << match;
+    }
+
 	return result;
 }
 
@@ -367,12 +365,13 @@ QVariant SearchResultModel::headerData(int section, Qt::Orientation orientation,
 
 int SearchResultModel::getNextSearchResultColumn(const QString &text, int col)
 {
-	QRegExp m_regexp = generateRegExp(mExpression, mIsCaseSensitive, mIsWord, mIsRegExp);
+    QRegularExpression m_regexp = generateRegularExpression(mExpression, mIsCaseSensitive, mIsWord, mIsRegExp);
 
 	int i = 0;
 	int i_old = 0;
 	while (i <= col && i > -1) {
-		i = m_regexp.indexIn(text, i);
+        QRegularExpressionMatch match = m_regexp.match(text,i);
+        i = match.capturedStart();
 		if (i > -1) {
 			i_old = i;
 			i++;

src/smallUsefulFunctions.cpp

@@ -464,7 +464,8 @@ QString findToken(const QString &line, const QString &token, int &start)
  * \param token regexp to search
  * \return text after token
  */
-QString findToken(const QString &line, QRegExp &token)
+/*
+QString findToken(const QString &line, QRegularExpression &token)
 {
 	//ATTENTION: token is not const because, you can't call cap on const qregexp in qt < 4.5
 	int tagStart = 0;
@@ -476,7 +477,7 @@ QString findToken(const QString &line, QRegExp &token)
 		return s;
 	}
 	return "";
-}
+}*/
 
 bool findTokenWithArg(const QString &line, const QString &token, QString &outName, QString &outArg)
 {
@@ -607,26 +608,6 @@ QString getParamItem(const QString &line, int pos, bool stopAtWhiteSpace)
 	return line.mid(start, end - start);
 }
 
-QRegExp generateRegExp(const QString &text, const bool isCase, const bool isWord, const bool isRegExp)
-{
-	Qt::CaseSensitivity cs = isCase ? Qt::CaseSensitive : Qt::CaseInsensitive;
-	QRegExp m_regexp;
-	if ( isRegExp ) {
-		m_regexp = QRegExp(text, cs, QRegExp::RegExp);
-	} else if ( isWord ) {
-		//todo: screw this? it prevents searching of "world!" and similar things
-		//(qtextdocument just checks the surrounding character when searching for whole words, this would also allow wholewords|regexp search)
-		m_regexp = QRegExp(
-		               QString("\\b%1\\b").arg(QRegExp::escape(text)),
-		               cs,
-		               QRegExp::RegExp
-		           );
-	} else {
-		m_regexp = QRegExp(text, cs, QRegExp::FixedString);
-	}
-	return m_regexp;
-}
-
 QRegularExpression generateRegularExpression(const QString &text, const bool isCase, const bool isWord, const bool isRegExp)
 {
     QRegularExpression::PatternOption po = isCase ? QRegularExpression::NoPatternOption : QRegularExpression::CaseInsensitiveOption;
@@ -646,18 +627,6 @@ QRegularExpression generateRegularExpression(const QString &text, const bool isC
     return m_regexp;
 }
 
-QStringList regExpFindAllMatches(const QString &searchIn, const QRegExp &regexp, int cap)
-{
-	int offset = regexp.indexIn(searchIn);
-	QStringList res;
-	while (offset > -1) {
-		res << regexp.cap(cap);
-		offset = regexp.indexIn(searchIn, offset + regexp.matchedLength());
-	}
-	return res;
-}
-
-
 QStringList regularExpressionFindAllMatches(const QString &searchIn, const QRegularExpression &regexp, int cap)
 {
     QRegularExpressionMatch match = regexp.match(searchIn);

src/smallUsefulFunctions.h

@@ -84,15 +84,15 @@ QString trimRight(const QString &s);
 /// find token (e.g. \label \input \section and return content (\section{content})
 QString findToken(const QString &line, const QString &token);
 QString findToken(const QString &line, const QString &token, int &start);
-QString findToken(const QString &line, QRegExp &token);
+//QString findToken(const QString &line, QRegularExpression &token);
 /// find token (e.g. \label \input \section and return content (\newcommand{name}[arg]), returns true if outName!=""
 bool findTokenWithArg(const QString &line, const QString &token, QString &outName, QString &outArg);
 
 
 /// generate multiple times used regexpression
-QRegExp generateRegExp(const QString &text, const bool isCase, const bool isWord, const bool isRegExp);
+QRegularExpression generateRegularExpression(const QString &text, const bool isCase, const bool isWord, const bool isRegExp);
 
-QStringList regExpFindAllMatches(const QString &searchIn, const QRegExp &regexp, int cap = 0);
+QStringList regularExpressionFindAllMatches(const QString &searchIn, const QRegularExpression &regexp, int cap = 0);
 QList<int> indicesOf(const QString &line, const QString &word, Qt::CaseSensitivity cs = Qt::CaseSensitive);
 QList<int> indicesOf(const QString &line, const QRegularExpression &rx);