rdnvndr
/
plugin
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Заменяет foreach на for

This commit is contained in:
Andrey Rodionov 2019-01-09 19:19:33 +03:00
parent fa60a90589
commit decefa853e
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/iplugin.cpp
View File

@ -6,7 +6,7 @@ IPlugin::IPlugin(const QString& depInterfaces)
{
PluginManager *pluginManager = PluginManager::instance();
m_depModulList = depInterfaces.split(" ");
foreach (const QString &depPlugin, depModulList()) {
for (const QString &depPlugin : depModulList()) {
if (!depPlugin.isEmpty())
pluginManager->nextLoadPlugins(depPlugin);
}
@ -17,7 +17,7 @@ IPlugin::IPlugin(const QString& depInterfaces)
IPlugin::~IPlugin()
{
// NOTE: Возможно надо сделать на цикле for
foreach (IPlugin *plug,PluginManager::instance()->dependentPlugins(this)) {
for (IPlugin *plug : PluginManager::instance()->dependentPlugins(this)) {
if (!PluginManager::instance()->dependentPlugins(this).isEmpty())
if (plug)
delete plug;

2
src/iplugin.h
View File

@ -25,7 +25,7 @@ QT_END_NAMESPACE
//! Класс плагина
/*! Этот класс предназначен для создания пользовательского
плагина путем наследования данного класса. Работа с
плагина путём наследования данного класса. Работа с
плагинами производится при помощи класса PluginManager
\n
Пример: \n

14
src/pluginmanager.cpp
View File

@ -55,8 +55,8 @@ QList<IPlugin *> PluginManager::dependPlugins(IPlugin *plugin)
QHash<QString, IPlugin *> pluginList;
if (plugin)
foreach (const QString &depInterfaceName, plugin->depModulList())
foreach (QObject *objInterfacePlugin, interfaceObjects(depInterfaceName)) {
for (const QString &depInterfaceName : plugin->depModulList())
for (QObject *objInterfacePlugin : interfaceObjects(depInterfaceName)) {
IPlugin *interfacePlugin = qobject_cast<IPlugin *>(objInterfacePlugin);
if (interfacePlugin)
pluginList[objInterfacePlugin->objectName()] = interfacePlugin;
@ -68,10 +68,10 @@ QList<IPlugin *> PluginManager::dependentPlugins(IPlugin *plugin)
{
QHash<QString, IPlugin *> pluginList;
foreach (QObject *objPlug, m_interfaces.values("IPlugin")) {
for (QObject *objPlug : m_interfaces.values("IPlugin")) {
IPlugin *plug = qobject_cast<IPlugin *>(objPlug);
if (plug && plug!=plugin)
foreach (IPlugin *interfacePlugin,dependPlugins(plug))
for (IPlugin *interfacePlugin : dependPlugins(plug))
if (plugin == interfacePlugin)
pluginList[objPlug->objectName()] = plug;
}
@ -139,7 +139,7 @@ bool PluginManager::loadPlugin(QString fileName, QString iid)
this, &PluginManager::removePlugin);
plugin->setObjectName(plugin->metaObject()->className());
foreach (const QString &interface, corePlugin->interfaces())
for (const QString &interface : corePlugin->interfaces())
m_interfaces.insert(interface, plugin);
emit loadedPlugin(plugin);
@ -159,8 +159,8 @@ void PluginManager::setSettings(QSettings *s)
void PluginManager::removePlugin(QObject *obj)
{
foreach (const QString &interface, m_interfaces.keys())
foreach (QObject *plug,m_interfaces.values(interface))
for (const QString &interface : m_interfaces.keys())
for (QObject *plug : m_interfaces.values(interface))
if (plug == obj) {
m_interfaces.remove(interface, plug);
qCDebug(lcPlugin) << tr("Очищен модуль ") + plug->objectName();

11
tests/auto/tst_pluginmanager/tst_pluginmanager.cpp
View File

@ -130,7 +130,7 @@ void tst_PluginManager::interfaceObjects()
QStringList objectName;
objectName << "tst_plugin3" << "tst_plugin4";
foreach (QObject *interfaceObject, listObject) {
for (QObject *interfaceObject : qAsConst(listObject)) {
QVERIFY(objectName.removeOne(interfaceObject->metaObject()->className()));
}
}
@ -147,10 +147,10 @@ void tst_PluginManager::dependentPlugins()
dependentName4 << "tst_plugin1";
QList<QObject *> plugins = m_pluginManager.interfaceObjects("IPlugin");
foreach (QObject *plugin, plugins) {
for (QObject *plugin : qAsConst(plugins)) {
IPlugin *iplugin = qobject_cast<IPlugin *>(plugin);
QList<IPlugin *> listDependent = m_pluginManager.dependentPlugins(iplugin);
foreach (IPlugin *pluginDependent, listDependent) {
for (IPlugin *pluginDependent : qAsConst(listDependent)) {
if (iplugin->name() == QString("tst_plugin1")) {
QVERIFY(dependentName1.removeOne(pluginDependent->name()));
} else if (iplugin->name() == QString("tst_plugin2")) {
@ -182,10 +182,10 @@ void tst_PluginManager::dependPlugins()
dependName4 << "tst_plugin3";
QList<QObject *> plugins = m_pluginManager.interfaceObjects("IPlugin");
foreach (QObject *plugin, plugins) {
for (QObject *plugin : qAsConst(plugins)) {
IPlugin *iplugin = qobject_cast<IPlugin *>(plugin);
QList<IPlugin *> listDepend = m_pluginManager.dependPlugins(iplugin);
foreach (IPlugin *pluginDepend, listDepend) {
for (IPlugin *pluginDepend : qAsConst(listDepend)) {
if (iplugin->name() == QString("tst_plugin1")) {
QVERIFY(dependName1.removeOne(pluginDepend->name()));
} else if (iplugin->name() == QString("tst_plugin2")) {
@ -228,5 +228,4 @@ void tst_PluginManager::settings()
QCOMPARE(settings, m_pluginManager.settings());
}
QTEST_MAIN(tst_PluginManager)
#include "tst_pluginmanager.moc"