From 3c2231f53d264f63a182a31e1693ca95bc399573 Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Sun, 13 Oct 2024 21:07:03 +0200 Subject: [PATCH] Fix KF5 linking error --- src/core/Config.h | 4 +--- src/core/FileReader.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/Config.h b/src/core/Config.h index c4fc639..08c2d9e 100644 --- a/src/core/Config.h +++ b/src/core/Config.h @@ -9,8 +9,6 @@ namespace struct Config { // General config keys constexpr static const auto ConfigFileName = "emojirunnerrc"; - constexpr static const auto RelativeConfigFolder = "/.config/krunnerplugins/"; - constexpr static QLatin1String SharedEmojiFileName{"emojirunner/emojis.json"}; constexpr static const auto RootGroup = "Config"; constexpr static const auto GlobalSearch = "globalSearch"; constexpr static const auto PasteAction = "pasteAction"; @@ -32,7 +30,7 @@ struct Config { constexpr static const auto SmileysEmotionsCategory = "Smileys & Emotion"; constexpr static const auto DisabledCategories = "disabledCategories"; - static QString emojiFilePath() + static inline QString emojiFilePath() { return QDir::homePath() + QLatin1String("/.local/share/emojirunner/customemojis.json"); } diff --git a/src/core/FileReader.cpp b/src/core/FileReader.cpp index 5208526..1b2e038 100644 --- a/src/core/FileReader.cpp +++ b/src/core/FileReader.cpp @@ -22,7 +22,7 @@ FileReader::FileReader(const KConfigGroup &config) QList FileReader::getEmojiCategories(bool getAllEmojis) const { // Emojis for user level install - QString emojisFilePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, Config::SharedEmojiFileName, QStandardPaths::LocateFile); + QString emojisFilePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("emojirunner/emojis.json"), QStandardPaths::LocateFile); QFile emojisFile(emojisFilePath); QMap preconfiguredEmojis; if (emojisFile.exists() && emojisFile.open(QIODevice::ReadOnly)) {