Fixes: rempve unnneded icore.h #include

Task:     180315
    RevBy:
    Details:
This commit is contained in:
hjk
2009-01-21 18:30:45 +01:00
parent 09316a10df
commit 592560b578
5 changed files with 7 additions and 20 deletions

View File

@@ -338,27 +338,17 @@ QStringList BinEditorFactory::mimeTypes() const
///////////////////////////////// BinEditorPlugin ////////////////////////////////// ///////////////////////////////// BinEditorPlugin //////////////////////////////////
BinEditorPlugin *BinEditorPlugin::m_instance = 0;
BinEditorPlugin::BinEditorPlugin() BinEditorPlugin::BinEditorPlugin()
{ {
m_undoAction = m_redoAction = m_copyAction = m_selectAllAction = 0; m_undoAction = m_redoAction = m_copyAction = m_selectAllAction = 0;
m_instance = this;
} }
BinEditorPlugin::~BinEditorPlugin() BinEditorPlugin::~BinEditorPlugin()
{ {
m_instance = 0;
}
BinEditorPlugin *BinEditorPlugin::instance()
{
return m_instance;
} }
QAction *BinEditorPlugin::registerNewAction(const QString &id, const QString &title) QAction *BinEditorPlugin::registerNewAction(const QString &id, const QString &title)
{ {
QAction *result = new QAction(title, this); QAction *result = new QAction(title, this);
Core::ICore::instance()->actionManager()->registerAction(result, id, m_context); Core::ICore::instance()->actionManager()->registerAction(result, id, m_context);
return result; return result;

View File

@@ -43,7 +43,6 @@
#include <QtGui/QAction> #include <QtGui/QAction>
namespace Core { namespace Core {
class ICore;
class IWizard; class IWizard;
} }
@@ -61,8 +60,6 @@ public:
BinEditorPlugin(); BinEditorPlugin();
~BinEditorPlugin(); ~BinEditorPlugin();
static BinEditorPlugin *instance();
bool initialize(const QStringList &arguments, QString *error_message = 0); bool initialize(const QStringList &arguments, QString *error_message = 0);
void extensionsInitialized(); void extensionsInitialized();
@@ -77,6 +74,7 @@ private slots:
void updateActions(); void updateActions();
void updateCurrentEditor(Core::IContext *object); void updateCurrentEditor(Core::IContext *object);
private: private:
QList<int> m_context; QList<int> m_context;
QAction *registerNewAction(const QString &id, const QString &title = QString()); QAction *registerNewAction(const QString &id, const QString &title = QString());
@@ -90,9 +88,6 @@ private:
friend class BinEditorFactory; friend class BinEditorFactory;
Core::IEditor *createEditor(QWidget *parent); Core::IEditor *createEditor(QWidget *parent);
static BinEditorPlugin *m_instance;
Core::ICore *m_core;
typedef QList<Core::IWizard *> WizardList; typedef QList<Core::IWizard *> WizardList;
WizardList m_wizards; WizardList m_wizards;
BinEditorFactory *m_factory; BinEditorFactory *m_factory;

View File

@@ -33,6 +33,7 @@
#include "basefilefind.h" #include "basefilefind.h"
#include <coreplugin/icore.h>
#include <coreplugin/stylehelper.h> #include <coreplugin/stylehelper.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
@@ -40,7 +41,7 @@
#include <texteditor/itexteditor.h> #include <texteditor/itexteditor.h>
#include <texteditor/basetexteditor.h> #include <texteditor/basetexteditor.h>
#include <QtDebug> #include <QtCore/QDebug>
#include <QtCore/QDirIterator> #include <QtCore/QDirIterator>
#include <QtGui/QPushButton> #include <QtGui/QPushButton>
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>

View File

@@ -42,15 +42,15 @@ using namespace TextEditor;
using namespace TextEditor::Internal; using namespace TextEditor::Internal;
PlainTextEditorEditable::PlainTextEditorEditable(PlainTextEditor *editor) PlainTextEditorEditable::PlainTextEditorEditable(PlainTextEditor *editor)
:BaseTextEditorEditable(editor) : BaseTextEditorEditable(editor)
{ {
Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance(); Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_TEXT_EDITOR); m_context << uidm->uniqueIdentifier(Core::Constants::K_DEFAULT_TEXT_EDITOR);
m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR); m_context << uidm->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR);
} }
PlainTextEditor::PlainTextEditor(QWidget *parent) : PlainTextEditor::PlainTextEditor(QWidget *parent)
BaseTextEditor(parent) : BaseTextEditor(parent)
{ {
setRevisionsVisible(true); setRevisionsVisible(true);
setMarksVisible(true); setMarksVisible(true);

View File

@@ -43,6 +43,7 @@
#include "plaintexteditor.h" #include "plaintexteditor.h"
#include "storagesettings.h" #include "storagesettings.h"
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/mimedatabase.h> #include <coreplugin/mimedatabase.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>