Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refacotr: Using raw pointers instead of smart pointers in extension m… #2209

Merged
merged 1 commit into from
Aug 20, 2024
Merged

refacotr: Using raw pointers instead of smart pointers in extension m… #2209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/plugins/common/dfmplugin-utils/extensionimpl/emblemimpl/extensionemblemmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void EmblemIconWorker::onFetchEmblemIcons(const QList<QPair<QString, int>> &loca
return;

const auto &emblemPlugins = ExtensionPluginManager::instance().emblemPlugins();
std::for_each(emblemPlugins.begin(), emblemPlugins.end(), [&localPaths, this](QSharedPointer<DFMEXT::DFMExtEmblemIconPlugin> plugin) {
std::for_each(emblemPlugins.begin(), emblemPlugins.end(), [&localPaths, this](DFMEXT::DFMExtEmblemIconPlugin *plugin) {
Q_ASSERT(plugin);
for (const auto &path : localPaths) {
if (this->parseLocationEmblemIcons(path.first, path.second, plugin))
Expand All @@ -74,13 +74,13 @@ void EmblemIconWorker::onClearCache()
pluginCaches.clear();
}

bool EmblemIconWorker::parseLocationEmblemIcons(const QString &path, int count, QSharedPointer<dfmext::DFMExtEmblemIconPlugin> plugin)
bool EmblemIconWorker::parseLocationEmblemIcons(const QString &path, int count, dfmext::DFMExtEmblemIconPlugin *plugin)
{
const auto &emblem { plugin->locationEmblemIcons(path.toStdString(), count) };
const std::vector<DFMEXT::DFMExtEmblemIconLayout> &layouts { emblem.emblems() };
// why add `pluginCaches` ?
// To clear the emblem icon when a plugin returns an empty `DFMExtEmblemIconLayout`.
quint64 pluginAddr { reinterpret_cast<quint64>(plugin.data()) };
quint64 pluginAddr { reinterpret_cast<quint64>(plugin) };
const CacheType &curPluginCache { pluginCaches.value(pluginAddr) };
if (layouts.empty() && curPluginCache.value(path).isEmpty())
return false;
Expand Down Expand Up @@ -108,9 +108,9 @@ bool EmblemIconWorker::parseLocationEmblemIcons(const QString &path, int count,
return true;
}

void EmblemIconWorker::parseEmblemIcons(const QString &path, int count, QSharedPointer<dfmext::DFMExtEmblemIconPlugin> plugin)
void EmblemIconWorker::parseEmblemIcons(const QString &path, int count, dfmext::DFMExtEmblemIconPlugin *plugin)
{
quint64 pluginAddr { reinterpret_cast<quint64>(plugin.data()) };
quint64 pluginAddr { reinterpret_cast<quint64>(plugin) };
if (hasCachedByOtherLocationEmblem(path, pluginAddr))
return;
const std::vector<std::string> &icons { plugin->emblemIcons(path.toStdString()) };
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/common/dfmplugin-utils/extensionimpl/emblemimpl/extensionemblemmanager_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ public Q_SLOTS:

private:
// method 2
bool parseLocationEmblemIcons(const QString &path, int count, QSharedPointer<DFMEXT::DFMExtEmblemIconPlugin> plugin);
bool parseLocationEmblemIcons(const QString &path, int count, DFMEXT::DFMExtEmblemIconPlugin *plugin);
// method 1
void parseEmblemIcons(const QString &path, int count, QSharedPointer<DFMEXT::DFMExtEmblemIconPlugin> plugin);
void parseEmblemIcons(const QString &path, int count, DFMEXT::DFMExtEmblemIconPlugin *plugin);

CacheType makeCache(const QString &path, const QList<QPair<QString, int>> &group);
void makeLayoutGroup(const std::vector<DFMEXT::DFMExtEmblemIconLayout> &layouts, QList<QPair<QString, int>> *group);
Expand Down
12 changes: 6 additions & 6 deletions src/plugins/common/dfmplugin-utils/extensionimpl/pluginsload/extensionpluginmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,15 @@ void ExtensionPluginManagerPrivate::doAppendExt(const QString &name, ExtPluginLo

DFMEXT::DFMExtMenuPlugin *menu { loader->resolveMenuPlugin() };
if (menu)
menuMap.insert(name, QSharedPointer<DFMEXT::DFMExtMenuPlugin>(menu));
menuMap.insert(name, menu);

DFMEXT::DFMExtEmblemIconPlugin *emblem { loader->resolveEmblemPlugin() };
if (emblem)
emblemMap.insert(name, QSharedPointer<DFMEXT::DFMExtEmblemIconPlugin>(emblem));
emblemMap.insert(name, emblem);

DFMEXT::DFMExtWindowPlugin *window { loader->resolveWindowPlugin() };
if (window)
windowMap.insert(name, QSharedPointer<DFMEXT::DFMExtWindowPlugin>(window));
windowMap.insert(name, window);
}

void ExtensionPluginManagerPrivate::release()
Expand Down Expand Up @@ -237,21 +237,21 @@ bool ExtensionPluginManager::exists(ExtensionPluginManager::ExtensionType type)
return false;
}

QList<QSharedPointer<dfmext::DFMExtMenuPlugin>> ExtensionPluginManager::menuPlugins() const
QList<DFMEXT::DFMExtMenuPlugin *> ExtensionPluginManager::menuPlugins() const
{
Q_D(const ExtensionPluginManager);

return d->menuMap.values();
}

QList<QSharedPointer<dfmext::DFMExtEmblemIconPlugin>> ExtensionPluginManager::emblemPlugins() const
QList<DFMEXT::DFMExtEmblemIconPlugin *> ExtensionPluginManager::emblemPlugins() const
{
Q_D(const ExtensionPluginManager);

return d->emblemMap.values();
}

QList<QSharedPointer<dfmext::DFMExtWindowPlugin>> ExtensionPluginManager::windowPlugins() const
QList<DFMEXT::DFMExtWindowPlugin *> ExtensionPluginManager::windowPlugins() const
{
Q_D(const ExtensionPluginManager);

Expand Down
6 changes: 3 additions & 3 deletions src/plugins/common/dfmplugin-utils/extensionimpl/pluginsload/extensionpluginmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ class ExtensionPluginManager : public QObject
InitState currentState() const;
bool initialized() const;
bool exists(ExtensionType type) const;
QList<QSharedPointer<DFMEXT::DFMExtMenuPlugin>> menuPlugins() const;
QList<QSharedPointer<DFMEXT::DFMExtEmblemIconPlugin>> emblemPlugins() const;
QList<QSharedPointer<DFMEXT::DFMExtWindowPlugin>> windowPlugins() const;
QList<DFMEXT::DFMExtMenuPlugin *> menuPlugins() const;
QList<DFMEXT::DFMExtEmblemIconPlugin *> emblemPlugins() const;
QList<DFMEXT::DFMExtWindowPlugin *> windowPlugins() const;

DFMEXT::DFMExtMenuProxy *pluginMenuProxy() const;

Expand Down
6 changes: 3 additions & 3 deletions src/plugins/common/dfmplugin-utils/extensionimpl/pluginsload/extensionpluginmanager_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ class ExtensionPluginManagerPrivate : public QObject
Q_DECLARE_PUBLIC(ExtensionPluginManager)

public:
using DFMExtMenuPluginMap = QMap<QString, QSharedPointer<DFMEXT::DFMExtMenuPlugin>>;
using DFMExtEmblemPluginMap = QMap<QString, QSharedPointer<DFMEXT::DFMExtEmblemIconPlugin>>;
using DFMExtWindowPluginMap = QMap<QString, QSharedPointer<DFMEXT::DFMExtWindowPlugin>>;
using DFMExtMenuPluginMap = QMap<QString, DFMEXT::DFMExtMenuPlugin *>;
using DFMExtEmblemPluginMap = QMap<QString, DFMEXT::DFMExtEmblemIconPlugin *>;
using DFMExtWindowPluginMap = QMap<QString, DFMEXT::DFMExtWindowPlugin *>;

explicit ExtensionPluginManagerPrivate(ExtensionPluginManager *qq);
~ExtensionPluginManagerPrivate() override;
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/common/dfmplugin-utils/extensionimpl/windowimpl/extensionwindowsmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ static void doActionForEveryPlugin(std::function<void(DFMEXT::DFMExtWindowPlugin
return;
}
const auto &windowPlugins { ExtensionPluginManager::instance().windowPlugins() };
std::for_each(windowPlugins.begin(), windowPlugins.end(), [callback](QSharedPointer<DFMEXT::DFMExtWindowPlugin> plugin) {
std::for_each(windowPlugins.begin(), windowPlugins.end(), [callback](DFMEXT::DFMExtWindowPlugin *plugin) {
Q_ASSERT(plugin);
callback(plugin.data());
callback(plugin);
});
}

Expand Down
Loading