From 016eb7a9d29a3c3474067253e6d1896ec7f926f5 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Mon, 29 Jul 2024 08:02:40 +0200 Subject: [PATCH] Core: Remove unused functions Change-Id: I4c9123818c8818550574a8bbd86376d38c51b9a6 Reviewed-by: hjk Reviewed-by: Eike Ziller --- src/plugins/coreplugin/icore.cpp | 32 -------------------------------- src/plugins/coreplugin/icore.h | 2 -- 2 files changed, 34 deletions(-) diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 95f883c5398..c78d8b95c26 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -642,38 +642,6 @@ FilePath ICore::installerResourcePath(const QString &rel) / appInfo().id / rel; } -/*! - Returns the path to the plugins that are included in the \QC installation. - - \internal -*/ -QString ICore::pluginPath() -{ - return QDir::cleanPath(QCoreApplication::applicationDirPath() + '/' + RELATIVE_PLUGIN_PATH); -} - -/*! - Returns the path where user-specific plugins should be written. - - \internal -*/ -QString ICore::userPluginPath() -{ - const QVersionNumber appVersion = QVersionNumber::fromString( - QCoreApplication::applicationVersion()); - QString pluginPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); - if (Utils::HostOsInfo::isAnyUnixHost() && !Utils::HostOsInfo::isMacHost()) - pluginPath += "/data"; - pluginPath += '/' + QCoreApplication::organizationName() + '/'; - pluginPath += Utils::HostOsInfo::isMacHost() ? QGuiApplication::applicationDisplayName() - : appInfo().id; - pluginPath += "/plugins/"; - pluginPath += QString::number(appVersion.majorVersion()) + '.' - + QString::number(appVersion.minorVersion()) + '.' - + QString::number(appVersion.microVersion()); - return pluginPath; -} - /*! Returns the path, based on the relative path \a rel, to the command line tools that are included in the \QC installation. diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index 2c2dbc3c57a..9567e7c8d7c 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -147,8 +147,6 @@ public: static QString aboutInformationHtml(); static QString systemInformation(); static void setupScreenShooter(const QString &name, QWidget *w, const QRect &rc = QRect()); - static QString pluginPath(); - static QString userPluginPath(); static Utils::FilePath clangExecutable(const Utils::FilePath &clangBinDirectory); static Utils::FilePath clangdExecutable(const Utils::FilePath &clangBinDirectory); static Utils::FilePath clangTidyExecutable(const Utils::FilePath &clangBinDirectory);