diff --git a/src/drivers/mysql/MysqlConnection.cpp b/src/drivers/mysql/MysqlConnection.cpp --- a/src/drivers/mysql/MysqlConnection.cpp +++ b/src/drivers/mysql/MysqlConnection.cpp @@ -27,7 +27,7 @@ #include "KDbConnectionData.h" #include "KDbVersionInfo.h" -#include +#include MysqlConnection::MysqlConnection(KDbDriver *driver, const KDbConnectionData& connData, const KDbConnectionOptions &options) @@ -74,14 +74,15 @@ QString versionString; tristate res = querySingleString(KDbEscapedString("SELECT @@version"), &versionString, /*column*/0, false /*!addLimitTo1*/); - QRegExp versionRe(QLatin1String("(\\d+)\\.(\\d+)\\.(\\d+)")); + QRegularExpression versionRe(QLatin1String("^(\\d+)\\.(\\d+)\\.(\\d+)$")); + QRegularExpressionMatch match = versionRe.match(versionString); if (res == false) // sanity return false; - if (versionRe.exactMatch(versionString)) { + if (match.hasMatch()) { // (if querySingleString failed, the version will be 0.0.0... - version->setMajor(versionRe.cap(1).toInt()); - version->setMinor(versionRe.cap(2).toInt()); - version->setRelease(versionRe.cap(3).toInt()); + version->setMajor(match.captured(1).toInt()); + version->setMinor(match.captured(2).toInt()); + version->setRelease(match.captured(3).toInt()); } return true; } diff --git a/src/drivers/mysql/MysqlConnection_p.cpp b/src/drivers/mysql/MysqlConnection_p.cpp --- a/src/drivers/mysql/MysqlConnection_p.cpp +++ b/src/drivers/mysql/MysqlConnection_p.cpp @@ -222,11 +222,11 @@ // to be careful as enum values can have commas and quote marks in them // e.g. CREATE TABLE t(f enum('option,''') gives one option: "option,'" vals.remove(0, 5); - QRegExp rx = QRegExp("^'((?:[^,']|,|'')*)'"); + QRegularExpression rx = QRegularExpression("^'((?:[^,']|,|'')*)'"); QStringList values = QStringList(); int index = 0; - while ((index = rx.indexIn(vals, index, QRegExp::CaretAtOffset)) != -1) { + while ((index = rx.indexIn(vals, index, QRegularExpression::CaretAtOffset)) != -1) { int len = rx.matchedLength(); if (len != -1) { //qDebug() << "3 " << rx.cap(1); diff --git a/src/drivers/sqlite/SqliteConnection.cpp b/src/drivers/sqlite/SqliteConnection.cpp --- a/src/drivers/sqlite/SqliteConnection.cpp +++ b/src/drivers/sqlite/SqliteConnection.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include SqliteConnection::SqliteConnection(KDbDriver *driver, const KDbConnectionData& connData, const KDbConnectionOptions &options) @@ -68,11 +68,12 @@ { sqliteDebug(); version->setString(QLatin1String(SQLITE_VERSION)); //defined in sqlite3.h - QRegExp re(QLatin1String("(\\d+)\\.(\\d+)\\.(\\d+)")); - if (re.exactMatch(version->string())) { - version->setMajor(re.cap(1).toInt()); - version->setMinor(re.cap(2).toInt()); - version->setRelease(re.cap(3).toInt()); + QRegularExpression re(QLatin1String("^(\\d+)\\.(\\d+)\\.(\\d+)$")); + QRegularExpressionMatch match = re.match(version->string()); + if (match.hasMatch()) { + version->setMajor(match.captured(1).toInt()); + version->setMinor(match.captured(2).toInt()); + version->setRelease(match.captured(3).toInt()); } return true; } diff --git a/src/drivers/sybase/SybaseConnection.cpp b/src/drivers/sybase/SybaseConnection.cpp --- a/src/drivers/sybase/SybaseConnection.cpp +++ b/src/drivers/sybase/SybaseConnection.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include @@ -58,11 +58,12 @@ sybaseWarning() << "Couldn't fetch server version"; } - QRegExp versionRe("(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)"); - if (versionRe.exactMatch(serverVersionString)) { - version.major = versionRe.cap(1).toInt(); - version.minor = versionRe.cap(2).toInt(); - version.release = versionRe.cap(3).toInt(); + QRegularExpression versionRe("^(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)$"); + QRegularExpressionMatch match = versionRe.match(serverVersionString); + if (match.hasMatch()) { + version.major = match.captured(1).toInt(); + version.minor = match.captured(2).toInt(); + version.release = match.captured(3).toInt(); } return true; diff --git a/src/tools/KDbUtils.cpp b/src/tools/KDbUtils.cpp --- a/src/tools/KDbUtils.cpp +++ b/src/tools/KDbUtils.cpp @@ -33,7 +33,7 @@ #include "kdb_debug.h" #include "config-kdb.h" -#include +#include #include #include #include @@ -104,7 +104,7 @@ QString KDbUtils::stringToFileName(const QString& string) { QString _string(string); - _string.replace(QRegExp(QLatin1String("[\\\\/:\\*?\"<>|]")), QLatin1String(" ")); + _string.replace(QRegularExpression(QLatin1String("[\\\\/:\\*?\"<>|]")), QLatin1String(" ")); return _string.simplified(); }