Commit 592560b5 authored by hjk's avatar hjk
Browse files

Fixes: rempve unnneded icore.h #include

    Task:     180315
    RevBy:
    Details:
parent 09316a10
......@@ -338,27 +338,17 @@ QStringList BinEditorFactory::mimeTypes() const
///////////////////////////////// BinEditorPlugin //////////////////////////////////
BinEditorPlugin *BinEditorPlugin::m_instance = 0;
BinEditorPlugin::BinEditorPlugin()
{
m_undoAction = m_redoAction = m_copyAction = m_selectAllAction = 0;
m_instance = this;
}
BinEditorPlugin::~BinEditorPlugin()
{
m_instance = 0;
}
BinEditorPlugin *BinEditorPlugin::instance()
{
return m_instance;
}
QAction *BinEditorPlugin::registerNewAction(const QString &id, const QString &title)
{
QAction *result = new QAction(title, this);
Core::ICore::instance()->actionManager()->registerAction(result, id, m_context);
return result;
......
......@@ -43,7 +43,6 @@
#include <QtGui/QAction>
namespace Core {
class ICore;
class IWizard;
}
......@@ -61,8 +60,6 @@ public:
BinEditorPlugin();
~BinEditorPlugin();
static BinEditorPlugin *instance();
bool initialize(const QStringList &arguments, QString *error_message = 0);
void extensionsInitialized();
......@@ -77,6 +74,7 @@ private slots:
void updateActions();
void updateCurrentEditor(Core::IContext *object);
private:
QList<int> m_context;
QAction *registerNewAction(const QString &id, const QString &title = QString());
......@@ -90,9 +88,6 @@ private:
friend class BinEditorFactory;
Core::IEditor *createEditor(QWidget *parent);
static BinEditorPlugin *m_instance;
Core::ICore *m_core;
typedef QList<Core::IWizard *> WizardList;
WizardList m_wizards;
BinEditorFactory *m_factory;
......
......@@ -33,6 +33,7 @@
#include "basefilefind.h"
#include <coreplugin/icore.h>
#include <coreplugin/stylehelper.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/editormanager/editormanager.h>
......@@ -40,7 +41,7 @@
#include <texteditor/itexteditor.h>
#include <texteditor/basetexteditor.h>
#include <QtDebug>
#include <QtCore/QDebug>
#include <QtCore/QDirIterator>
#include <QtGui/QPushButton>
#include <QtGui/QFileDialog>
......
......@@ -42,15 +42,15 @@ using namespace TextEditor;
using namespace TextEditor::Internal;
PlainTextEditorEditable::PlainTextEditorEditable(PlainTextEditor *editor)
:BaseTextEditorEditable(editor)
: BaseTextEditorEditable(editor)
{
Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_TEXT_EDITOR);
m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
}
PlainTextEditor::PlainTextEditor(QWidget *parent) :
BaseTextEditor(parent)
PlainTextEditor::PlainTextEditor(QWidget *parent)
: BaseTextEditor(parent)
{
setRevisionsVisible(true);
setMarksVisible(true);
......
......@@ -43,6 +43,7 @@
#include "plaintexteditor.h"
#include "storagesettings.h"
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/mimedatabase.h>
#include <coreplugin/uniqueidmanager.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment