Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: 修改任务栏加载老版本插件的方式"

Browse Source 
This reverts commit 7658f813f69b96f8ba79b546208d0a7da3a27ff4.

Change-Id: I7678bf40141d86e956111c57a85dfda7c19197f7
This commit is contained in:
donghualin 2022-11-11 10:28:12 +08:00
parent 62c0802ae6
commit 8a01a93424
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frame/util/abstractpluginscontroller.cpp
View File

@ -274,12 +274,9 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile)
pluginIsValid = false; pluginIsValid = false;
} }
PluginsItemInterface *interface = nullptr; PluginsItemInterface *interface = qobject_cast<PluginsItemInterface *>(pluginLoader->instance());
// 如果版本是2.0.0，则认为是最新的插件，此时需要转换成v23的插件接口 if (!interface) {
if (pluginApi == "2.0.0") { // 如果识别当前插件失败，就认为这个插件是v20的插件，将其转换为v20插件接口
interface = qobject_cast<PluginsItemInterface *>(pluginLoader->instance());
} else if (pluginApi < "2.0.0") {
// 如果版本号小于2.0.0的，就认为这个插件是v20的插件，将其转换为v20插件接口
PluginsItemInterface_V20 *interface_v20 = qobject_cast<PluginsItemInterface_V20 *>(pluginLoader->instance()); PluginsItemInterface_V20 *interface_v20 = qobject_cast<PluginsItemInterface_V20 *>(pluginLoader->instance());
if (interface_v20) { if (interface_v20) {
// 将v20插件接口通过适配器转换成v23的接口，方便在后面识别 // 将v20插件接口通过适配器转换成v23的接口，方便在后面识别
@ -289,8 +286,6 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile)
m_pluginAdapterMap[(qulonglong)(interface_v20)] = pluginAdapter; m_pluginAdapterMap[(qulonglong)(interface_v20)] = pluginAdapter;
interface = pluginAdapter; interface = pluginAdapter;
} }
} else {
qWarning() << "the plugin is not valid " << pluginFile;
} }
if (!interface) { if (!interface) {

2
interfaces/pluginsiteminterface.h
View File

@ -287,7 +287,7 @@ protected:
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#define ModuleInterface_iid "com.deepin.dock.PluginsItemInterface" #define ModuleInterface_iid "com.deepin.dock.PluginsItemInterface_2_0_0"
Q_DECLARE_INTERFACE(PluginsItemInterface, ModuleInterface_iid) Q_DECLARE_INTERFACE(PluginsItemInterface, ModuleInterface_iid)
QT_END_NAMESPACE QT_END_NAMESPACE