diff options
Diffstat (limited to 'tests')
16 files changed, 103 insertions, 131 deletions
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp index 98cfc0e7d4c..bd8c3fd50ee 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp @@ -25,15 +25,8 @@ #include "plugin1.h" -#include <qplugin.h> -#include <QStringList> - using namespace Plugin1; -MyPlugin1::MyPlugin1() -{ -} - bool MyPlugin1::initialize(const QStringList &arguments, QString *errorString) { Q_UNUSED(arguments) diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h index 556fc0ba6fc..4fe8e95fc37 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h @@ -27,9 +27,6 @@ #include <extensionsystem/iplugin.h> -#include <QObject> -#include <QtGlobal> - #if defined(PLUGIN1_LIBRARY) # define PLUGIN1_EXPORT Q_DECL_EXPORT #else @@ -44,10 +41,10 @@ class PLUGIN1_EXPORT MyPlugin1 : public ExtensionSystem::IPlugin Q_PLUGIN_METADATA(IID "plugin" FILE "plugin1.json") public: - MyPlugin1(); + MyPlugin1() = default; - bool initialize(const QStringList &arguments, QString *errorString); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorString) final; + void extensionsInitialized() final; }; } // namespace Plugin1 diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp index 4d1bb259b74..3e6367dc3d8 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp @@ -25,14 +25,8 @@ #include "plugin2.h" -#include <qplugin.h> - using namespace Plugin2; -MyPlugin2::MyPlugin2() -{ -} - bool MyPlugin2::initialize(const QStringList &, QString *) { return true; diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h index e5e38e33005..adaf926905e 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h @@ -27,9 +27,6 @@ #include <extensionsystem/iplugin.h> -#include <QObject> -#include <QtGlobal> - #if defined(PLUGIN2_LIBRARY) # define PLUGIN2_EXPORT Q_DECL_EXPORT #else @@ -44,10 +41,10 @@ class PLUGIN2_EXPORT MyPlugin2 : public ExtensionSystem::IPlugin Q_PLUGIN_METADATA(IID "plugin" FILE "plugin2.json") public: - MyPlugin2(); + MyPlugin2() = default; - bool initialize(const QStringList &arguments, QString *errorString); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorString) final; + void extensionsInitialized() final; }; } // Plugin2 diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp index 6405c266688..0bb1fc88429 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp @@ -27,22 +27,20 @@ #include <extensionsystem/pluginmanager.h> -#include <qplugin.h> -#include <QObject> - using namespace Plugin1; -MyPlugin1::MyPlugin1() - : initializeCalled(false) +MyPlugin1::~MyPlugin1() { + ExtensionSystem::PluginManager::removeObject(object1); + ExtensionSystem::PluginManager::removeObject(object2); } bool MyPlugin1::initialize(const QStringList & /*arguments*/, QString *errorString) { initializeCalled = true; - QObject *obj = new QObject; - obj->setObjectName(QLatin1String("MyPlugin1")); - addAutoReleasedObject(obj); + object1 = new QObject(this); + object1->setObjectName(QLatin1String("MyPlugin1")); + ExtensionSystem::PluginManager::addObject(object1); bool found2 = false; bool found3 = false; @@ -70,8 +68,8 @@ void MyPlugin1::extensionsInitialized() if (!initializeCalled) return; // don't do this at home, it's just done here for the test - QObject *obj = new QObject; - obj->setObjectName(QLatin1String("MyPlugin1_running")); - addAutoReleasedObject(obj); + object2 = new QObject(this); + object2->setObjectName(QLatin1String("MyPlugin1_running")); + ExtensionSystem::PluginManager::addObject(object2); } diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h index 6a0d4c7f09a..a449f279545 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h @@ -27,9 +27,6 @@ #include <extensionsystem/iplugin.h> -#include <QObject> -#include <QtGlobal> - #if defined(PLUGIN1_LIBRARY) # define PLUGIN1_EXPORT Q_DECL_EXPORT #else @@ -44,13 +41,16 @@ class PLUGIN1_EXPORT MyPlugin1 : public ExtensionSystem::IPlugin Q_PLUGIN_METADATA(IID "plugin" FILE "plugin1.json") public: - MyPlugin1(); + MyPlugin1() = default; + ~MyPlugin1() final; - bool initialize(const QStringList &arguments, QString *errorString); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorString) final; + void extensionsInitialized() final; private: - bool initializeCalled; + bool initializeCalled = false; + QObject *object1 = nullptr; + QObject *object2 = nullptr; }; } // namespace Plugin1 diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp index cefdec9d101..3a9b60099f2 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp @@ -27,22 +27,20 @@ #include <extensionsystem/pluginmanager.h> -#include <qplugin.h> -#include <QObject> - using namespace Plugin2; -MyPlugin2::MyPlugin2() - : initializeCalled(false) +MyPlugin2::~MyPlugin2() { + ExtensionSystem::PluginManager::removeObject(object1); + ExtensionSystem::PluginManager::removeObject(object2); } bool MyPlugin2::initialize(const QStringList &, QString *) { initializeCalled = true; - QObject *obj = new QObject; - obj->setObjectName(QLatin1String("MyPlugin2")); - addAutoReleasedObject(obj); + object1 = new QObject(this); + object1->setObjectName("MyPlugin2"); + ExtensionSystem::PluginManager::addObject(object1); return true; } @@ -52,8 +50,8 @@ void MyPlugin2::extensionsInitialized() if (!initializeCalled) return; // don't do this at home, it's just done here for the test - QObject *obj = new QObject; - obj->setObjectName(QLatin1String("MyPlugin2_running")); - addAutoReleasedObject(obj); + object2 = new QObject(this); + object2->setObjectName("MyPlugin2_running"); + ExtensionSystem::PluginManager::addObject(object2); } diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h index 1a5ff1eb5ce..1cf5d217e99 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h @@ -27,9 +27,6 @@ #include <extensionsystem/iplugin.h> -#include <QObject> -#include <QtGlobal> - #if defined(PLUGIN2_LIBRARY) # define PLUGIN2_EXPORT Q_DECL_EXPORT #else @@ -44,13 +41,16 @@ class PLUGIN2_EXPORT MyPlugin2 : public ExtensionSystem::IPlugin Q_PLUGIN_METADATA(IID "plugin" FILE "plugin2.json") public: - MyPlugin2(); + MyPlugin2() = default; + ~MyPlugin2() final; - bool initialize(const QStringList &arguments, QString *errorString); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorString) final; + void extensionsInitialized() final; private: - bool initializeCalled; + bool initializeCalled = false; + QObject *object1 = nullptr; + QObject *object2 = nullptr; }; } // namespace Plugin2 diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp index b5f32ea1c77..a75ee58241e 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp @@ -27,22 +27,20 @@ #include <extensionsystem/pluginmanager.h> -#include <qplugin.h> -#include <QObject> - using namespace Plugin3; -MyPlugin3::MyPlugin3() - : initializeCalled(false) +MyPlugin3::~MyPlugin3() { + ExtensionSystem::PluginManager::removeObject(object1); + ExtensionSystem::PluginManager::removeObject(object2); } bool MyPlugin3::initialize(const QStringList & /*arguments*/, QString *errorString) { initializeCalled = true; - QObject *obj = new QObject; - obj->setObjectName(QLatin1String("MyPlugin3")); - addAutoReleasedObject(obj); + object1 = new QObject(this); + object1->setObjectName(QLatin1String("MyPlugin3")); + ExtensionSystem::PluginManager::addObject(object1); bool found2 = false; foreach (QObject *object, ExtensionSystem::PluginManager::allObjects()) { @@ -61,7 +59,7 @@ void MyPlugin3::extensionsInitialized() if (!initializeCalled) return; // don't do this at home, it's just done here for the test - QObject *obj = new QObject; - obj->setObjectName(QLatin1String("MyPlugin3_running")); - addAutoReleasedObject(obj); + object2 = new QObject(this); + object2->setObjectName(QLatin1String("MyPlugin3_running")); + ExtensionSystem::PluginManager::addObject(object2); } diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h index a8bfb4e7b64..bbc1e4d54d0 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h @@ -27,9 +27,6 @@ #include <extensionsystem/iplugin.h> -#include <QObject> -#include <QtGlobal> - #if defined(PLUGIN3_LIBRARY) # define PLUGIN3_EXPORT Q_DECL_EXPORT #else @@ -44,13 +41,16 @@ class PLUGIN3_EXPORT MyPlugin3 : public ExtensionSystem::IPlugin Q_PLUGIN_METADATA(IID "plugin" FILE "plugin3.json") public: - MyPlugin3(); + MyPlugin3() = default; + ~MyPlugin3() final; - bool initialize(const QStringList &arguments, QString *errorString); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorString) final; + void extensionsInitialized() final; private: - bool initializeCalled; + bool initializeCalled = false; + QObject *object1 = nullptr; + QObject *object2 = nullptr; }; } // namespace Plugin3 diff --git a/tests/manual/pluginview/plugins/plugin1/plugin1.cpp b/tests/manual/pluginview/plugins/plugin1/plugin1.cpp index f6fd28006b7..5308c8147e3 100644 --- a/tests/manual/pluginview/plugins/plugin1/plugin1.cpp +++ b/tests/manual/pluginview/plugins/plugin1/plugin1.cpp @@ -27,21 +27,20 @@ #include <extensionsystem/pluginmanager.h> -#include <QObject> - using namespace Plugin1; -MyPlugin1::MyPlugin1() - : initializeCalled(false) +MyPlugin1::~MyPlugin1() { + ExtensionSystem::PluginManager::removeObject(object1); + ExtensionSystem::PluginManager::removeObject(object2); } bool MyPlugin1::initialize(const QStringList & /*arguments*/, QString *errorString) { initializeCalled = true; - QObject *obj = new QObject(this); - obj->setObjectName("MyPlugin1"); - addAutoReleasedObject(obj); + object1 = new QObject(this); + object1->setObjectName("MyPlugin1"); + ExtensionSystem::PluginManager::addObject(object1); bool found2 = false; bool found3 = false; @@ -69,7 +68,7 @@ void MyPlugin1::extensionsInitialized() if (!initializeCalled) return; // don't do this at home, it's just done here for the test - QObject *obj = new QObject(this); - obj->setObjectName("MyPlugin1_running"); - addAutoReleasedObject(obj); + object2 = new QObject(this); + object2->setObjectName("MyPlugin1_running"); + ExtensionSystem::PluginManager::addObject(object2); } diff --git a/tests/manual/pluginview/plugins/plugin1/plugin1.h b/tests/manual/pluginview/plugins/plugin1/plugin1.h index 5621421aea6..68c819e1187 100644 --- a/tests/manual/pluginview/plugins/plugin1/plugin1.h +++ b/tests/manual/pluginview/plugins/plugin1/plugin1.h @@ -27,9 +27,6 @@ #include <extensionsystem/iplugin.h> -#include <QObject> -#include <QString> - namespace Plugin1 { class MyPlugin1 : public ExtensionSystem::IPlugin @@ -38,13 +35,16 @@ class MyPlugin1 : public ExtensionSystem::IPlugin Q_PLUGIN_METADATA(IID "plugin" FILE "plugin1.json") public: - MyPlugin1(); + MyPlugin1() = default; + ~MyPlugin1() final; - bool initialize(const QStringList &arguments, QString *errorString); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorString) final; + void extensionsInitialized() final; private: - bool initializeCalled; + bool initializeCalled = false; + QObject *object1 = nullptr; + QObject *object2 = nullptr; }; } // namespace Plugin1 diff --git a/tests/manual/pluginview/plugins/plugin2/plugin2.cpp b/tests/manual/pluginview/plugins/plugin2/plugin2.cpp index 72e194fb910..19f63f57a72 100644 --- a/tests/manual/pluginview/plugins/plugin2/plugin2.cpp +++ b/tests/manual/pluginview/plugins/plugin2/plugin2.cpp @@ -27,22 +27,21 @@ #include <extensionsystem/pluginmanager.h> -#include <QObject> - using namespace Plugin2; -MyPlugin2::MyPlugin2() - : initializeCalled(false) +MyPlugin2::~MyPlugin2() { + ExtensionSystem::PluginManager::removeObject(object1); + ExtensionSystem::PluginManager::removeObject(object2); } bool MyPlugin2::initialize(const QStringList & /*arguments*/, QString *errorString) { Q_UNUSED(errorString) initializeCalled = true; - QObject *obj = new QObject(this); - obj->setObjectName("MyPlugin2"); - addAutoReleasedObject(obj); + object1 = new QObject(this); + object1->setObjectName("MyPlugin2"); + ExtensionSystem::PluginManager::addObject(object1); return true; } @@ -52,7 +51,7 @@ void MyPlugin2::extensionsInitialized() if (!initializeCalled) return; // don't do this at home, it's just done here for the test - QObject *obj = new QObject(this); - obj->setObjectName("MyPlugin2_running"); - addAutoReleasedObject(obj); + object2 = new QObject(this); + object2->setObjectName("MyPlugin2_running"); + ExtensionSystem::PluginManager::addObject(object2); } diff --git a/tests/manual/pluginview/plugins/plugin2/plugin2.h b/tests/manual/pluginview/plugins/plugin2/plugin2.h index c949b318f4f..df6d1893a2e 100644 --- a/tests/manual/pluginview/plugins/plugin2/plugin2.h +++ b/tests/manual/pluginview/plugins/plugin2/plugin2.h @@ -27,9 +27,6 @@ #include <extensionsystem/iplugin.h> -#include <QObject> -#include <QString> - namespace Plugin2 { class MyPlugin2 : public ExtensionSystem::IPlugin @@ -38,13 +35,16 @@ class MyPlugin2 : public ExtensionSystem::IPlugin Q_PLUGIN_METADATA(IID "plugin" FILE "plugin2.json") public: - MyPlugin2(); + MyPlugin2() = default; + ~MyPlugin2() final; - bool initialize(const QStringList &arguments, QString *errorString); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorString) final; + void extensionsInitialized() final; private: - bool initializeCalled; + bool initializeCalled = false; + QObject *object1 = nullptr; + QObject *object2 = nullptr; }; } // namespace Plugin2 diff --git a/tests/manual/pluginview/plugins/plugin3/plugin3.cpp b/tests/manual/pluginview/plugins/plugin3/plugin3.cpp index 10e44366fc8..0ba714709f5 100644 --- a/tests/manual/pluginview/plugins/plugin3/plugin3.cpp +++ b/tests/manual/pluginview/plugins/plugin3/plugin3.cpp @@ -27,24 +27,23 @@ #include <extensionsystem/pluginmanager.h> -#include <QObject> - using namespace Plugin3; -MyPlugin3::MyPlugin3() - : initializeCalled(false) +MyPlugin3::~MyPlugin3() { + ExtensionSystem::PluginManager::removeObject(object1); + ExtensionSystem::PluginManager::removeObject(object2); } bool MyPlugin3::initialize(const QStringList & /*arguments*/, QString *errorString) { initializeCalled = true; - QObject *obj = new QObject(this); - obj->setObjectName("MyPlugin3"); - addAutoReleasedObject(obj); + object1 = new QObject(this); + object1->setObjectName("MyPlugin3"); + ExtensionSystem::PluginManager::addObject(object1); bool found2 = false; - foreach (QObject *object, ExtensionSystem::PluginManager::instance()->allObjects()) { + foreach (QObject *object, ExtensionSystem::PluginManager::allObjects()) { if (object->objectName() == "MyPlugin2") found2 = true; } @@ -60,7 +59,7 @@ void MyPlugin3::extensionsInitialized() if (!initializeCalled) return; // don't do this at home, it's just done here for the test - QObject *obj = new QObject(this); - obj->setObjectName("MyPlugin3_running"); - addAutoReleasedObject(obj); + object2 = new QObject(this); + object2->setObjectName("MyPlugin3_running"); + ExtensionSystem::PluginManager::addObject(object2); } diff --git a/tests/manual/pluginview/plugins/plugin3/plugin3.h b/tests/manual/pluginview/plugins/plugin3/plugin3.h index 0678e698f08..8ce26fe575d 100644 --- a/tests/manual/pluginview/plugins/plugin3/plugin3.h +++ b/tests/manual/pluginview/plugins/plugin3/plugin3.h @@ -27,9 +27,6 @@ #include <extensionsystem/iplugin.h> -#include <QObject> -#include <QString> - namespace Plugin3 { class MyPlugin3 : public ExtensionSystem::IPlugin @@ -38,13 +35,16 @@ class MyPlugin3 : public ExtensionSystem::IPlugin Q_PLUGIN_METADATA(IID "plugin" FILE "plugin3.json") public: - MyPlugin3(); + MyPlugin3() = default; + ~MyPlugin3(); - bool initialize(const QStringList &arguments, QString *errorString); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorString) final; + void extensionsInitialized() final; private: - bool initializeCalled; + bool initializeCalled = false; + QObject *object1 = nullptr; + QObject *object2 = nullptr; }; } // namespace Plugin3 |