From 0e258a5a32a44a29c75fe406fac5b6de17fb7886 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 18 Oct 2020 14:12:01 +0200 Subject: [PATCH] Remove unused utilities functions --- src/core/utilities.cpp | 23 ----------------------- src/core/utilities.h | 6 ------ 2 files changed, 29 deletions(-) diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp index c1dd3c1e2..02c5ba790 100644 --- a/src/core/utilities.cpp +++ b/src/core/utilities.cpp @@ -762,29 +762,6 @@ bool IsLaptop() { } -bool UrlOnSameDriveAsStrawberry(const QUrl &url) { - - if (!url.isValid() || !url.isLocalFile() || url.toLocalFile().isEmpty()) return false; - -#ifdef Q_OS_WIN - QUrl appUrl = QUrl::fromLocalFile(QCoreApplication::applicationDirPath()); - if (url.toLocalFile().left(1) == appUrl.toLocalFile().left(1)) - return true; - else - return false; -#else - // Non windows systems have always a / in the path - return true; -#endif - -} - -QUrl GetRelativePathToStrawberryBin(const QUrl &url) { - if (!url.isValid()) return QUrl(); - QDir appPath(QCoreApplication::applicationDirPath()); - return QUrl::fromLocalFile(appPath.relativeFilePath(url.toLocalFile())); -} - QString GetEnv(const QString &key) { return QString::fromLocal8Bit(qgetenv(key.toLocal8Bit())); } diff --git a/src/core/utilities.h b/src/core/utilities.h index 80131eb64..5a21db62e 100644 --- a/src/core/utilities.h +++ b/src/core/utilities.h @@ -108,12 +108,6 @@ const char *EnumToString(const QMetaObject &meta, const char *name, int value); QStringList Prepend(const QString &text, const QStringList &list); QStringList Updateify(const QStringList &list); -// Check if two urls are on the same drive (mainly for windows) -bool UrlOnSameDriveAsStrawberry(const QUrl &url); - -// Get relative path to Strawberry binary -QUrl GetRelativePathToStrawberryBin(const QUrl &url); - QString GetEnv(const QString &key); void SetEnv(const char *key, const QString &value); void IncreaseFDLimit();