forked from qt-creator/qt-creator
31a55b0247
Remove now-unused IPlugin::addAutoReleasedObject and IPlugin::
{add,remove}Object convenience functions that were only forwarding
to the global pool.
Adjust all related tests.
All previous users of these convenience functions are gone, and we do
not want to encourage the use of object pool anymore.
Plugins that wish to share objects to implement weak dependencies
can use the global object pool via ExtensionSystem::PluginManager::
{add,remove}Object directly.
Change-Id: Ic668ad5504af76963f6d4c69ae160438efc70db5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
58 lines
2.0 KiB
C++
58 lines
2.0 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "plugin2.h"
|
|
|
|
#include <extensionsystem/pluginmanager.h>
|
|
|
|
using namespace Plugin2;
|
|
|
|
MyPlugin2::~MyPlugin2()
|
|
{
|
|
ExtensionSystem::PluginManager::removeObject(object1);
|
|
ExtensionSystem::PluginManager::removeObject(object2);
|
|
}
|
|
|
|
bool MyPlugin2::initialize(const QStringList & /*arguments*/, QString *errorString)
|
|
{
|
|
Q_UNUSED(errorString)
|
|
initializeCalled = true;
|
|
object1 = new QObject(this);
|
|
object1->setObjectName("MyPlugin2");
|
|
ExtensionSystem::PluginManager::addObject(object1);
|
|
|
|
return true;
|
|
}
|
|
|
|
void MyPlugin2::extensionsInitialized()
|
|
{
|
|
if (!initializeCalled)
|
|
return;
|
|
// don't do this at home, it's just done here for the test
|
|
object2 = new QObject(this);
|
|
object2->setObjectName("MyPlugin2_running");
|
|
ExtensionSystem::PluginManager::addObject(object2);
|
|
}
|