feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance()

Browse Source
This commit is contained in:
hjk
2009-01-20 11:52:04 +01:00
parent d1dac15cc5
commit 113b81e9db
85 changed files with 432 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/regexp/regexpplugin.cpp
View File

@@ -32,14 +32,15 @@
***************************************************************************/
#include "regexpplugin.h"
#include "settings.h"
#include "regexpwindow.h"
#include "settings.h"
#include <coreplugin/baseview.h>
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h>
#include <QtCore/qplugin.h>
#include <QtCore/QtPlugin>
using namespace RegExp::Internal;
@@ -49,25 +50,24 @@ RegExpPlugin::RegExpPlugin()
RegExpPlugin::~RegExpPlugin()
{
if (m_regexpWindow) {
m_regexpWindow->settings().toQSettings(m_core->settings());
}
if (m_regexpWindow)
m_regexpWindow->settings().toQSettings(Core::ICore::instance()->settings());
}
void RegExpPlugin::extensionsInitialized()
{
}
bool RegExpPlugin::initialize(const QStringList & /*arguments*/, QString *error_message)
bool RegExpPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(error_message)
m_core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
Q_UNUSED(arguments);
Q_UNUSED(errorMessage)
Core::ICore *core = Core::ICore::instance();
m_regexpWindow = new RegExpWindow;
Settings settings;
settings.fromQSettings(m_core->settings());
settings.fromQSettings(core->settings());
m_regexpWindow->setSettings(settings);
const int plugId = m_core->uniqueIDManager()->uniqueIdentifier(QLatin1String("RegExpPlugin"));
const int plugId = core->uniqueIDManager()->uniqueIdentifier(QLatin1String("RegExpPlugin"));
addAutoReleasedObject(new Core::BaseView("TextEditor.RegExpWindow",
m_regexpWindow,
QList<int>() << plugId,

7
src/plugins/regexp/regexpplugin.h
View File

@@ -39,10 +39,6 @@
#include <QtCore/QObject>
#include <QtCore/QPointer>
namespace Core {
class ICore;
}
namespace RegExp {
namespace Internal {
@@ -56,11 +52,10 @@ public:
RegExpPlugin();
virtual ~RegExpPlugin();
bool initialize(const QStringList &arguments, QString *error_message);
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
private:
Core::ICore *m_core;
QPointer<RegExpWindow> m_regexpWindow;
};