10 files changed, 23 insertions, 24 deletions
diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp
index 9bbef3f2..2128b4f4 100644
--- a/src/directoryrefresher.cpp
+++ b/src/directoryrefresher.cpp
@@ -36,7 +36,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QApplication>
 #include <QDir>
 #include <QString>
-#include <QTextCodec>
 
 #include <fstream>
 
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 73e6abde..10ebe3e7 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -37,7 +37,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QTimer>
 #include <QFileInfo>
-#include <QRegExp>
 #include <QDirIterator>
 #include <QDesktopServices>
 #include <QInputDialog>
@@ -1684,9 +1683,10 @@ void DownloadManager::nxmFilesAvailable(QString, int, QVariant userData, QVarian
   // this may muck up the file name comparison
   QString alternativeLocalName = info->m_FileName;
 
-  QRegExp expression("^\\d_(.*)$");
-  if (expression.indexIn(alternativeLocalName) == 0) {
-    alternativeLocalName = expression.cap(1);
+  QRegularExpression expression("^\\d_(.*)$");
+  auto match = expression.match(alternativeLocalName);
+  if (match.hasMatch()) {
+    alternativeLocalName = match.captured(1);
   }
 
   bool found = false;
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index 0ba82a5c..0c6af11d 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -40,7 +40,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFileInfo>
 #include <QLibrary>
 #include <QInputDialog>
-#include <QRegExp>
 #include <QDir>
 #include <QMessageBox>
 #include <QSettings>
diff --git a/src/loghighlighter.cpp b/src/loghighlighter.cpp
index f43e5662..cd7129ac 100644
--- a/src/loghighlighter.cpp
+++ b/src/loghighlighter.cpp
@@ -18,7 +18,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "loghighlighter.h"
-#include <QRegExp>
 
 LogHighlighter::LogHighlighter(QObject *parent) :
     QSyntaxHighlighter(parent)
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 906e40d6..e792abf5 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -132,7 +132,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QPushButton>
 #include <QRadioButton>
 #include <QRect>
-#include <QRegExp>
 #include <QResizeEvent>
 #include <QScopedPointer>
 #include <QSizePolicy>
@@ -3472,14 +3471,16 @@ QString MainWindow::queryRestore(const QString &filePath)
   QFileInfoList files = pluginFileInfo.absoluteDir().entryInfoList(QStringList(pattern), QDir::Files, QDir::Name);
 
   SelectionDialog dialog(tr("Choose backup to restore"), this);
-  QRegExp exp(pluginFileInfo.fileName() + PATTERN_BACKUP_REGEX);
-  QRegExp exp2(pluginFileInfo.fileName() + "\\.(.*)");
+  QRegularExpression exp(QRegularExpression::anchoredPattern(pluginFileInfo.fileName() + PATTERN_BACKUP_REGEX));
+  QRegularExpression exp2(QRegularExpression::anchoredPattern(pluginFileInfo.fileName() + "\\.(.*)"));
   for(const QFileInfo &info : boost::adaptors::reverse(files)) {
-    if (exp.exactMatch(info.fileName())) {
-      QDateTime time = QDateTime::fromString(exp.cap(1), PATTERN_BACKUP_DATE);
-      dialog.addChoice(time.toString(), "", exp.cap(1));
-    } else if (exp2.exactMatch(info.fileName())) {
-      dialog.addChoice(exp2.cap(1), "", exp2.cap(1));
+    auto match = exp.match(info.fileName());
+    auto match2 = exp2.match(info.fileName());
+    if (match.hasMatch()) {
+      QDateTime time = QDateTime::fromString(match.captured(1), PATTERN_BACKUP_DATE);
+      dialog.addChoice(time.toString(), "", match.captured(1));
+    } else if (match2.hasMatch()) {
+      dialog.addChoice(match2.captured(1), "", match2.captured(1));
     }
   }
 
diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp
index f72e8d0c..272d2ec6 100644
--- a/src/modlistviewactions.cpp
+++ b/src/modlistviewactions.cpp
@@ -4,7 +4,6 @@
 #include <QGroupBox>
 #include <QInputDialog>
 #include <QLabel>
-#include <QRegExp>
 
 #include <log.h>
 #include <report.h>
@@ -1147,10 +1146,11 @@ void ModListViewActions::openExplorer(const QModelIndexList& index) const
 
 void ModListViewActions::restoreBackup(const QModelIndex& index) const
 {
-  QRegExp backupRegEx("(.*)_backup[0-9]*$");
+  QRegularExpression backupRegEx("(.*)_backup[0-9]*$");
   ModInfo::Ptr modInfo = ModInfo::getByIndex(index.data(ModList::IndexRole).toInt());
-  if (backupRegEx.indexIn(modInfo->name()) != -1) {
-    QString regName = backupRegEx.cap(1);
+  auto match = backupRegEx.match(modInfo->name());
+  if (match.hasMatch()) {
+    QString regName = match.captured(1);
     QDir modDir(QDir::fromNativeSeparators(m_core.settings().paths().mods()));
     if (!modDir.exists(regName) ||
       (QMessageBox::question(m_parent, tr("Overwrite?"),
diff --git a/src/pch.h b/src/pch.h
index b9958710..f12e9110 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -220,7 +220,6 @@
 #include <QTableWidget>
 #include <QTemporaryFile>
 #include <QTextBrowser>
-#include <QTextCodec>
 #include <QTextDocument>
 #include <QTextEdit>
 #include <QTextStream>
diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
index e35e4081..28e0af51 100644
--- a/src/pluginlist.cpp
+++ b/src/pluginlist.cpp
@@ -43,7 +43,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QTextCodec>
 #include <QFileInfo>
 #include <QListWidgetItem>
 #include <QRegularExpression>
diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp
index ea012a94..1b24f3f1 100644
--- a/src/selfupdater.cpp
+++ b/src/selfupdater.cpp
@@ -45,7 +45,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QNetworkReply>
 #include <QProcess>
 #include <QProgressDialog>
-#include <QRegExp>
 #include <QStringList>
 #include <QTimer>
 #include <QUrl>
diff --git a/src/texteditor.cpp b/src/texteditor.cpp
index af4c63c8..7f62a6ef 100644
--- a/src/texteditor.cpp
+++ b/src/texteditor.cpp
@@ -107,10 +107,14 @@ bool TextEditor::save()
   file.open(QIODevice::WriteOnly);
   file.resize(0);
 
-  QTextCodec* codec = QTextCodec::codecForName(m_encoding.toUtf8());
+  auto codec = QStringConverter::encodingForName(m_encoding.toLocal8Bit());
+  if (!codec.has_value())
+    return false;
+  QStringEncoder encoder(codec.value());
+
   QString data = toPlainText().replace("\n", "\r\n");
 
-  file.write(codec->fromUnicode(data));
+  file.write(encoder.encode(data));
   document()->setModified(false);
 
   return true;