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

3
src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
View File

@@ -36,7 +36,6 @@
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
#include <extensionsystem/pluginmanager.h>
namespace VCSBase {
@@ -83,7 +82,7 @@ QStringList BaseVCSSubmitEditorFactory::mimeTypes() const
Core::IFile *BaseVCSSubmitEditorFactory::open(const QString &fileName)
{
Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
Core::ICore *core = Core::ICore::instance();
if (Core::IEditor *iface = core->editorManager()->openEditor(fileName, kind()))
return iface->file();
return 0;

93
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -68,8 +68,7 @@ class VCSBaseEditorEditable : public TextEditor::BaseTextEditorEditable
{
public:
VCSBaseEditorEditable(VCSBaseEditor *,
const VCSBaseEditorParameters *type,
Core::ICore *);
const VCSBaseEditorParameters *type);
QList<int> context() const;
bool duplicateSupported() const { return false; }
@@ -83,11 +82,10 @@ private:
};
VCSBaseEditorEditable::VCSBaseEditorEditable(VCSBaseEditor *editor,
const VCSBaseEditorParameters *type,
Core::ICore *core) :
BaseTextEditorEditable(editor),
m_kind(type->kind)
const VCSBaseEditorParameters *type)
: BaseTextEditorEditable(editor), m_kind(type->kind)
{
Core::ICore *core = Core::ICore::instance();
m_context << core->uniqueIDManager()->uniqueIdentifier(QLatin1String(type->context))
<< core->uniqueIDManager()->uniqueIdentifier(QLatin1String(TextEditor::Constants::C_TEXTEDITOR));
@@ -100,46 +98,39 @@ QList<int> VCSBaseEditorEditable::context() const
// ----------- VCSBaseEditorPrivate
struct VCSBaseEditorPrivate {
struct VCSBaseEditorPrivate
{
VCSBaseEditorPrivate(const VCSBaseEditorParameters *type, QObject *parent);
const VCSBaseEditorParameters *m_parameters;
QAction *m_describeAction;
QString m_currentChange;
Core::ICore *m_core;
QString m_source;
};
VCSBaseEditorPrivate::VCSBaseEditorPrivate(const VCSBaseEditorParameters *type, QObject *parent) :
m_parameters(type),
m_describeAction(new QAction(parent)),
m_core(ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>())
VCSBaseEditorPrivate::VCSBaseEditorPrivate(const VCSBaseEditorParameters *type, QObject *parent)
: m_parameters(type), m_describeAction(new QAction(parent))
{
}
// ------------ VCSBaseEditor
VCSBaseEditor::VCSBaseEditor(const VCSBaseEditorParameters *type,
QWidget *parent) :
BaseTextEditor(parent),
m_d(new VCSBaseEditorPrivate(type, this))
VCSBaseEditor::VCSBaseEditor(const VCSBaseEditorParameters *type, QWidget *parent)
: BaseTextEditor(parent),
d(new VCSBaseEditorPrivate(type, this))
{
if (VCSBase::Constants::Internal::debug)
qDebug() << "VCSBaseEditor::VCSBaseEditor" << type->type << type->kind;
setReadOnly(true);
connect(m_d->m_describeAction, SIGNAL(triggered()), this, SLOT(describe()));
connect(d->m_describeAction, SIGNAL(triggered()), this, SLOT(describe()));
viewport()->setMouseTracking(true);
setBaseTextDocument(new Internal::VCSBaseTextDocument);
setMimeType(QLatin1String(m_d->m_parameters->mimeType));
setMimeType(QLatin1String(d->m_parameters->mimeType));
}
void VCSBaseEditor::init()
{
switch (m_d->m_parameters->type) {
switch (d->m_parameters->type) {
case RegularCommandOutput:
case LogOutput:
case AnnotateOutput:
@@ -154,17 +145,17 @@ void VCSBaseEditor::init()
VCSBaseEditor::~VCSBaseEditor()
{
delete m_d;
delete d;
}
QString VCSBaseEditor::source() const
{
return m_d->m_source;
return d->m_source;
}
void VCSBaseEditor::setSource(const QString &source)
{
m_d->m_source = source;
d->m_source = source;
}
QTextCodec *VCSBaseEditor::codec() const
@@ -183,7 +174,7 @@ void VCSBaseEditor::setCodec(QTextCodec *c)
EditorContentType VCSBaseEditor::contentType() const
{
return m_d->m_parameters->type;
return d->m_parameters->type;
}
bool VCSBaseEditor::isModified() const
@@ -193,19 +184,19 @@ bool VCSBaseEditor::isModified() const
TextEditor::BaseTextEditorEditable *VCSBaseEditor::createEditableInterface()
{
return new VCSBaseEditorEditable(this, m_d->m_parameters, m_d->m_core);
return new VCSBaseEditorEditable(this, d->m_parameters);
}
void VCSBaseEditor::contextMenuEvent(QContextMenuEvent *e)
{
QMenu *menu = createStandardContextMenu();
// 'click on change-interaction'
if (m_d->m_parameters->type == LogOutput || m_d->m_parameters->type == AnnotateOutput) {
m_d->m_currentChange = changeUnderCursor(cursorForPosition(e->pos()));
if (!m_d->m_currentChange.isEmpty()) {
m_d->m_describeAction->setText(tr("Describe change %1").arg(m_d->m_currentChange));
if (d->m_parameters->type == LogOutput || d->m_parameters->type == AnnotateOutput) {
d->m_currentChange = changeUnderCursor(cursorForPosition(e->pos()));
if (!d->m_currentChange.isEmpty()) {
d->m_describeAction->setText(tr("Describe change %1").arg(d->m_currentChange));
menu->addSeparator();
menu->addAction(m_d->m_describeAction);
menu->addAction(d->m_describeAction);
}
}
menu->exec(e->globalPos());
@@ -217,7 +208,7 @@ void VCSBaseEditor::mouseMoveEvent(QMouseEvent *e)
bool overrideCursor = false;
Qt::CursorShape cursorShape;
if (m_d->m_parameters->type == LogOutput || m_d->m_parameters->type == AnnotateOutput) {
if (d->m_parameters->type == LogOutput || d->m_parameters->type == AnnotateOutput) {
// Link emulation behaviour for 'click on change-interaction'
QTextCursor cursor = cursorForPosition(e->pos());
QString change = changeUnderCursor(cursor);
@@ -245,11 +236,11 @@ void VCSBaseEditor::mouseMoveEvent(QMouseEvent *e)
void VCSBaseEditor::mouseReleaseEvent(QMouseEvent *e)
{
if (m_d->m_parameters->type == LogOutput || m_d->m_parameters->type == AnnotateOutput) {
if (d->m_parameters->type == LogOutput || d->m_parameters->type == AnnotateOutput) {
if (e->button() == Qt::LeftButton &&!(e->modifiers() & Qt::ShiftModifier)) {
QTextCursor cursor = cursorForPosition(e->pos());
m_d->m_currentChange = changeUnderCursor(cursor);
if (!m_d->m_currentChange.isEmpty()) {
d->m_currentChange = changeUnderCursor(cursor);
if (!d->m_currentChange.isEmpty()) {
describe();
e->accept();
return;
@@ -261,7 +252,7 @@ void VCSBaseEditor::mouseReleaseEvent(QMouseEvent *e)
void VCSBaseEditor::mouseDoubleClickEvent(QMouseEvent *e)
{
if (m_d->m_parameters->type == DiffOutput) {
if (d->m_parameters->type == DiffOutput) {
if (e->button() == Qt::LeftButton &&!(e->modifiers() & Qt::ShiftModifier)) {
QTextCursor cursor = cursorForPosition(e->pos());
jumpToChangeFromDiff(cursor);
@@ -282,16 +273,16 @@ void VCSBaseEditor::keyPressEvent(QKeyEvent *e)
void VCSBaseEditor::describe()
{
if (VCSBase::Constants::Internal::debug)
qDebug() << "VCSBaseEditor::describe" << m_d->m_currentChange;
if (!m_d->m_currentChange.isEmpty())
emit describeRequested(m_d->m_source, m_d->m_currentChange);
qDebug() << "VCSBaseEditor::describe" << d->m_currentChange;
if (!d->m_currentChange.isEmpty())
emit describeRequested(d->m_source, d->m_currentChange);
}
void VCSBaseEditor::slotActivateAnnotation()
{
// The annotation highlighting depends on contents (change number
// set with assigned colors)
if (m_d->m_parameters->type != AnnotateOutput)
if (d->m_parameters->type != AnnotateOutput)
return;
const QSet<QString> changes = annotationChanges();
@@ -372,9 +363,10 @@ void VCSBaseEditor::jumpToChangeFromDiff(QTextCursor cursor)
if (!exists)
return;
Core::IEditor *ediface = m_d->m_core->editorManager()->openEditor(fileName);
m_d->m_core->editorManager()->ensureEditorManagerVisible();
if (TextEditor::ITextEditor *editor = qobject_cast<TextEditor::ITextEditor *>(ediface))
Core::EditorManager *em = Core::ICore::instance()->editorManager();
Core::IEditor *ed = em->openEditor(fileName);
em->ensureEditorManagerVisible();
if (TextEditor::ITextEditor *editor = qobject_cast<TextEditor::ITextEditor *>(ed))
editor->gotoLine(chunkStart + lineCount);
}
@@ -386,7 +378,7 @@ void VCSBaseEditor::setPlainTextData(const QByteArray &data)
void VCSBaseEditor::setFontSettings(const TextEditor::FontSettings &fs)
{
TextEditor::BaseTextEditor::setFontSettings(fs);
if (m_d->m_parameters->type == DiffOutput) {
if (d->m_parameters->type == DiffOutput) {
if (DiffHighlighter *highlighter = qobject_cast<DiffHighlighter*>(baseTextDocument()->syntaxHighlighter())) {
static QVector<QString> categories;
if (categories.isEmpty()) {
@@ -413,11 +405,12 @@ const VCSBaseEditorParameters *VCSBaseEditor::findType(const VCSBaseEditorParame
}
// Find the codec used for a file querying the editor.
static QTextCodec *findFileCodec(const Core::ICore *core, const QString &source)
static QTextCodec *findFileCodec(const QString &source)
{
typedef QList<Core::IEditor *> EditorList;
const EditorList editors = core->editorManager()->editorsForFileName(source);
const EditorList editors =
Core::ICore::instance()->editorManager()->editorsForFileName(source);
if (!editors.empty()) {
const EditorList::const_iterator ecend = editors.constEnd();
for (EditorList::const_iterator it = editors.constBegin(); it != ecend; ++it)
@@ -456,13 +449,13 @@ static QTextCodec *findProjectCodec(const QString &dir)
return 0;
}
QTextCodec *VCSBaseEditor::getCodec(const Core::ICore *core, const QString &source)
QTextCodec *VCSBaseEditor::getCodec(const QString &source)
{
if (!source.isEmpty()) {
// Check file
const QFileInfo sourceFi(source);
if (sourceFi.isFile())
if (QTextCodec *fc = findFileCodec(core, source))
if (QTextCodec *fc = findFileCodec(source))
return fc;
// Find by project via directory
if (QTextCodec *pc = findProjectCodec(sourceFi.isFile() ? sourceFi.absolutePath() : source))

8
src/plugins/vcsbase/vcsbaseeditor.h
View File

@@ -46,10 +46,6 @@ class QTextCodec;
class QTextCursor;
QT_END_NAMESPACE
namespace Core {
class ICore;
}
namespace VCSBase {
struct VCSBaseEditorPrivate;
@@ -121,7 +117,7 @@ public:
// the editor manager and the project managers (defaults to system codec).
// The codec should be set on editors displaying diff or annotation
// output.
static QTextCodec *getCodec(const Core::ICore *core, const QString &source);
static QTextCodec *getCodec(const QString &source);
// Utility to return the editor from the IEditor returned by the editor
// manager which is a BaseTextEditable.
@@ -166,7 +162,7 @@ private:
void jumpToChangeFromDiff(QTextCursor cursor);
VCSBaseEditorPrivate *m_d;
VCSBaseEditorPrivate *d;
};
} // namespace VCSBase

9
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -34,13 +34,12 @@
#include "vcsbaseplugin.h"
#include "diffhighlighter.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/mimedatabase.h>
#include <QtCore/qplugin.h>
#include <QtCore/QtPlugin>
namespace VCSBase {
namespace Internal {
@@ -57,10 +56,12 @@ VCSBasePlugin::~VCSBasePlugin()
m_instance = 0;
}
bool VCSBasePlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
bool VCSBasePlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
Q_UNUSED(arguments);
Q_UNUSED(errorMessage);
Core::ICore *core = Core::ICore::instance();
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/vcsbase/VCSBase.mimetypes.xml"), errorMessage))
return false;

7
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -59,12 +59,12 @@ enum { wantToolBar = 0 };
namespace VCSBase {
struct VCSBaseSubmitEditorPrivate {
struct VCSBaseSubmitEditorPrivate
{
VCSBaseSubmitEditorPrivate(const VCSBaseSubmitEditorParameters *parameters,
Core::Utils::SubmitEditorWidget *editorWidget,
QObject *q);
Core::ICore *m_core;
Core::Utils::SubmitEditorWidget *m_widget;
QToolBar *m_toolWidget;
const VCSBaseSubmitEditorParameters *m_parameters;
@@ -79,13 +79,12 @@ struct VCSBaseSubmitEditorPrivate {
VCSBaseSubmitEditorPrivate::VCSBaseSubmitEditorPrivate(const VCSBaseSubmitEditorParameters *parameters,
Core::Utils::SubmitEditorWidget *editorWidget,
QObject *q) :
m_core(ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()),
m_widget(editorWidget),
m_toolWidget(0),
m_parameters(parameters),
m_file(new VCSBase::Internal::SubmitEditorFile(QLatin1String(m_parameters->mimeType), q))
{
m_contexts << m_core->uniqueIDManager()->uniqueIdentifier(m_parameters->context);
m_contexts << Core::ICore::instance()->uniqueIDManager()->uniqueIdentifier(m_parameters->context);
}
VCSBaseSubmitEditor::VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *parameters,