From 7582b62ddfdf1f1834143b587ef45b585990073d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 23 Nov 2022 18:25:55 +0100 Subject: [PATCH] TextEditor: Remove unused findFallbackDefinitionsLocation() Change-Id: Ib5c02562087c2ee11b5aa1c19c823cf8fd2af828 Reviewed-by: David Schulz Reviewed-by: --- .../texteditor/highlightersettings.cpp | 57 ------------------- src/plugins/texteditor/highlightersettings.h | 4 -- .../texteditor/highlightersettingspage.cpp | 4 +- 3 files changed, 2 insertions(+), 63 deletions(-) diff --git a/src/plugins/texteditor/highlightersettings.cpp b/src/plugins/texteditor/highlightersettings.cpp index e62ea67cfef..3493090c366 100644 --- a/src/plugins/texteditor/highlightersettings.cpp +++ b/src/plugins/texteditor/highlightersettings.cpp @@ -7,68 +7,11 @@ #include -#include -#include -#include -#include - #include -#include using namespace Utils; namespace TextEditor { -namespace Internal { - -FilePath findFallbackDefinitionsLocation() -{ - if (HostOsInfo::isAnyUnixHost() && !HostOsInfo::isMacHost()) { - static const QLatin1String kateSyntaxPaths[] = { - QLatin1String("/share/apps/katepart/syntax"), - QLatin1String("/share/kde4/apps/katepart/syntax") - }; - - // Some wild guesses. - for (const auto &kateSyntaxPath : kateSyntaxPaths) { - const FilePath paths[] = { - FilePath("/usr") / kateSyntaxPath, - FilePath("/usr/local") / kateSyntaxPath, - FilePath("/opt") / kateSyntaxPath - }; - for (const FilePath &path : paths) { - if (path.exists() && !path.dirEntries({{"*.xml"}}).isEmpty()) - return path; - } - } - - // Try kde-config. - const FilePath programs[] = {"kde-config", "kde4-config"}; - for (const FilePath &program : programs) { - QtcProcess process; - process.setTimeoutS(5); - process.setCommand({program, {"--prefix"}}); - process.runBlocking(); - if (process.result() == ProcessResult::FinishedWithSuccess) { - QString output = process.cleanedStdOut(); - output.remove('\n'); - const FilePath dir = FilePath::fromString(output); - for (auto &kateSyntaxPath : kateSyntaxPaths) { - const FilePath path = dir / kateSyntaxPath; - if (path.exists() && !path.dirEntries({{"*.xml"}}).isEmpty()) - return path; - } - } - } - } - - const FilePath dir = Core::ICore::resourcePath("generic-highlighter"); - if (dir.exists() && !dir.dirEntries({{"*.xml"}}).isEmpty()) - return dir; - - return {}; -} - -} // namespace Internal const QLatin1String kDefinitionFilesPath("UserDefinitionFilesPath"); const QLatin1String kIgnoredFilesPatterns("IgnoredFilesPatterns"); diff --git a/src/plugins/texteditor/highlightersettings.h b/src/plugins/texteditor/highlightersettings.h index fc1c5133605..99236f417ac 100644 --- a/src/plugins/texteditor/highlightersettings.h +++ b/src/plugins/texteditor/highlightersettings.h @@ -50,8 +50,4 @@ private: QList m_ignoredFiles; }; -namespace Internal { -Utils::FilePath findFallbackDefinitionsLocation(); -} - } // namespace TextEditor diff --git a/src/plugins/texteditor/highlightersettingspage.cpp b/src/plugins/texteditor/highlightersettingspage.cpp index 777bff397ba..514bbbc91b3 100644 --- a/src/plugins/texteditor/highlightersettingspage.cpp +++ b/src/plugins/texteditor/highlightersettingspage.cpp @@ -20,7 +20,6 @@ #include #include -using namespace TextEditor::Internal; using namespace Utils; namespace TextEditor { @@ -107,6 +106,8 @@ public: } // Internal +using namespace Internal; + class HighlighterSettingsPagePrivate { Q_DECLARE_TR_FUNCTIONS(TextEditor::Internal::HighlighterSettingsPage) @@ -129,7 +130,6 @@ public: QPointer m_widget; }; - void HighlighterSettingsPagePrivate::migrateGenericHighlighterFiles() { QDir userDefinitionPath(m_settings.definitionFilesPath().toString());