diff options
| -rw-r--r-- | src/libs/installer/lib7z_facade.cpp | 4 | ||||
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 5 | ||||
| -rw-r--r-- | src/libs/kdtools/kdupdaterupdateoperations.cpp | 7 |
3 files changed, 5 insertions, 11 deletions
diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp index cdbe3313b..14bfd25a0 100644 --- a/src/libs/installer/lib7z_facade.cpp +++ b/src/libs/installer/lib7z_facade.cpp @@ -110,9 +110,7 @@ struct DirectoryGuard { m_created(false), m_released(false) { - const QRegExp re(QLatin1String("\\\\|/")); - const QLatin1String sep("/"); - m_path.replace(re, sep); + m_path.replace(QLatin1Char('\\'), QLatin1Char('/')); } ~DirectoryGuard() diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 7f7330934..9bd8c64bb 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -1376,13 +1376,12 @@ void PackageManagerCorePrivate::runInstaller() // to have some progress for writeUninstaller ProgressCoordinator::instance()->addReservePercentagePoints(1); - static const QLatin1String sep("/"); - const QString target = QDir::cleanPath(targetDir().replace(QRegExp(QLatin1String("\\\\|/")), sep)); + const QString target = QDir::cleanPath(targetDir().replace(QLatin1Char('\\'), QLatin1Char('/'))); if (target.isEmpty()) throw Error(tr("Variable 'TargetDir' not set.")); if (!QDir(target).exists()) { - const QString &pathToTarget = target.mid(0, target.lastIndexOf(sep)); + const QString &pathToTarget = target.mid(0, target.lastIndexOf(QLatin1Char('/'))); if (!QDir(pathToTarget).exists()) { Operation *pathToTargetOp = createOwnedOperation(QLatin1String("Mkdir")); pathToTargetOp->setArguments(QStringList() << pathToTarget); diff --git a/src/libs/kdtools/kdupdaterupdateoperations.cpp b/src/libs/kdtools/kdupdaterupdateoperations.cpp index 9e2f5eb21..6f934abe8 100644 --- a/src/libs/kdtools/kdupdaterupdateoperations.cpp +++ b/src/libs/kdtools/kdupdaterupdateoperations.cpp @@ -410,18 +410,15 @@ MkdirOperation::MkdirOperation() void MkdirOperation::backup() { - static const QRegExp re(QLatin1String("\\\\|/")); - static const QLatin1String sep("/"); - QString path = arguments().first(); - path.replace(re, sep); + path.replace(QLatin1Char('\\'), QLatin1Char('/')); QDir createdDir = QDir::root(); // find out, which part of the path is the first one we actually need to create int end = 0; while (true) { - QString p = path.section(sep, 0, ++end); + QString p = path.section(QLatin1Char('/'), 0, ++end); createdDir = QDir(p); if (!createdDir.exists()) break; |