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

21
src/plugins/snippets/snippetsplugin.cpp
View File

@@ -36,13 +36,12 @@
#include "snippetsplugin.h"
#include "snippetspec.h"
#include <QtCore/qplugin.h>
#include <QtCore/QtPlugin>
#include <QtCore/QDebug>
#include <QtGui/QShortcut>
#include <QtGui/QApplication>
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/actionmanager/actionmanagerinterface.h>
#include <coreplugin/editormanager/editormanager.h>
@@ -69,19 +68,20 @@ void SnippetsPlugin::extensionsInitialized()
{
}
bool SnippetsPlugin::initialize(const QStringList & /*arguments*/, QString *)
bool SnippetsPlugin::initialize(const QStringList &arguments, QString *)
{
m_core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
Core::ActionManager *am = m_core->actionManager();
Q_UNUSED(arguments);
Core::ICore *core = Core::ICore::instance();
Core::ActionManager *am = core->actionManager();
QList<int> context;
context << m_core->uniqueIDManager()->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
context << core->uniqueIDManager()->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
m_snippetWnd = new SnippetsWindow();
addAutoReleasedObject(new Core::BaseView("Snippets.SnippetsTree",
m_snippetWnd,
QList<int>() << m_core->uniqueIDManager()->uniqueIdentifier(QLatin1String("Snippets Window"))
<< m_core->uniqueIDManager()->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR),
QList<int>() << core->uniqueIDManager()->uniqueIdentifier(QLatin1String("Snippets Window"))
<< core->uniqueIDManager()->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR),
Qt::RightDockWidgetArea));
m_snippetsCompletion = new SnippetsCompletion(this);
addObject(m_snippetsCompletion);
@@ -107,11 +107,12 @@ QString SnippetsPlugin::simplifySnippetName(SnippetSpec *snippet) const
void SnippetsPlugin::snippetActivated()
{
Core::ICore *core = Core::ICore::instance();
SnippetSpec *snippet = m_shortcuts.value(sender());
if (snippet && m_core->editorManager()->currentEditor()) {
if (snippet && core->editorManager()->currentEditor()) {
TextEditor::ITextEditable *te =
qobject_cast<TextEditor::ITextEditable *>(
m_core->editorManager()->currentEditor());
core->editorManager()->currentEditor());
m_snippetWnd->insertSnippet(te, snippet);
}
}

9
src/plugins/snippets/snippetsplugin.h
View File

@@ -40,11 +40,6 @@
#include <extensionsystem/iplugin.h>
namespace Core {
class ICore;
struct Application;
}
namespace Snippets {
namespace Internal {
@@ -62,9 +57,8 @@ public:
static SnippetsPlugin *instance() { return m_instance; }
static SnippetsWindow *snippetsWindow() { return m_instance->m_snippetWnd; }
static Core::ICore *core() { return m_instance->m_core; }
bool initialize(const QStringList &arguments, QString *error_message);
bool initialize(const QStringList &arguments, QString *errorMessage);
void extensionsInitialized();
private slots:
@@ -74,7 +68,6 @@ private:
static SnippetsPlugin *m_instance;
QString simplifySnippetName(SnippetSpec *snippet) const;
Core::ICore *m_core;
SnippetsCompletion *m_snippetsCompletion;
SnippetsWindow *m_snippetWnd;