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

25
src/plugins/find/findplugin.cpp
View File

@@ -60,8 +60,7 @@ using namespace Find;
using namespace Find::Internal;
FindPlugin::FindPlugin()
: m_core(0),
m_currentDocumentFind(0),
: m_currentDocumentFind(0),
m_findToolBar(0),
m_findDialog(0),
m_findCompletionModel(new QStringListModel(this)),
@@ -78,14 +77,14 @@ FindPlugin::~FindPlugin()
bool FindPlugin::initialize(const QStringList &, QString *)
{
m_core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
Core::ICore *core = Core::ICore::instance();
setupMenu();
m_currentDocumentFind = new CurrentDocumentFind(m_core);
m_currentDocumentFind = new CurrentDocumentFind(core);
m_findToolBar = new FindToolBar(this, m_currentDocumentFind);
m_findDialog = new FindToolWindow(this);
SearchResultWindow *searchResultWindow = new SearchResultWindow(m_core);
SearchResultWindow *searchResultWindow = new SearchResultWindow(core);
addAutoReleasedObject(searchResultWindow);
return true;
}
@@ -125,10 +124,10 @@ void FindPlugin::openFindFilter()
m_findDialog->open(filter);
}
void FindPlugin::setupMenu()
{
Core::ActionManager *am = m_core->actionManager();
Core::ICore *core = Core::ICore::instance();
Core::ActionManager *am = core->actionManager();
Core::ActionContainer *medit = am->actionContainer(Core::Constants::M_EDIT);
Core::ActionContainer *mfind = am->createMenu(Constants::M_FIND);
medit->addMenu(mfind, Core::Constants::G_EDIT_FIND);
@@ -151,7 +150,8 @@ void FindPlugin::setupMenu()
void FindPlugin::setupFilterMenuItems()
{
Core::ActionManager *am = m_core->actionManager();
Core::ICore *core = Core::ICore::instance();
Core::ActionManager *am = core->actionManager();
QList<IFindFilter*> findInterfaces =
ExtensionSystem::PluginManager::instance()->getObjects<IFindFilter>();
Core::Command *cmd;
@@ -173,11 +173,6 @@ void FindPlugin::setupFilterMenuItems()
m_findDialog->setFindFilters(findInterfaces);
}
Core::ICore *FindPlugin::core()
{
return m_core;
}
QTextDocument::FindFlags FindPlugin::findFlags() const
{
return m_findFlags;
@@ -218,7 +213,7 @@ bool FindPlugin::hasFindFlag(QTextDocument::FindFlag flag)
void FindPlugin::writeSettings()
{
QSettings *settings = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()->settings();
QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find");
settings->setValue("Backward", QVariant((m_findFlags & QTextDocument::FindBackward) != 0));
settings->setValue("CaseSensitively", QVariant((m_findFlags & QTextDocument::FindCaseSensitively) != 0));
@@ -231,7 +226,7 @@ void FindPlugin::writeSettings()
void FindPlugin::readSettings()
{
QSettings *settings = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()->settings();
QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find");
bool block = blockSignals(true);
setBackward(settings->value("Backward", false).toBool());

2
src/plugins/find/findplugin.h
View File

@@ -64,7 +64,6 @@ public:
void extensionsInitialized();
void shutdown();
Core::ICore *core();
QTextDocument::FindFlags findFlags() const;
void updateFindCompletion(const QString &text);
void updateReplaceCompletion(const QString &text);
@@ -93,7 +92,6 @@ private:
void readSettings();
//variables
Core::ICore *m_core;
QHash<IFindFilter *, QAction *> m_filterActions;
CurrentDocumentFind *m_currentDocumentFind;

2
src/plugins/find/findtoolbar.cpp
View File

@@ -141,7 +141,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
QList<int> globalcontext;
globalcontext << Core::Constants::C_GLOBAL_ID;
Core::ActionManager *am = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()->actionManager();
Core::ActionManager *am = Core::ICore::instance()->actionManager();
Core::ActionContainer *mfind = am->actionContainer(Constants::M_FIND);
Core::Command *cmd;

6
src/plugins/find/findtoolwindow.cpp
View File

@@ -42,7 +42,7 @@ using namespace Find;
using namespace Find::Internal;
FindToolWindow::FindToolWindow(FindPlugin *plugin)
: QDialog(plugin->core()->mainWindow()),
: QDialog(Core::ICore::instance()->mainWindow()),
m_plugin(plugin),
m_findCompleter(new QCompleter(this))
{
@@ -124,7 +124,7 @@ void FindToolWindow::search()
void FindToolWindow::writeSettings()
{
QSettings *settings = m_plugin->core()->settings();
QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find");
foreach (IFindFilter *filter, m_filters)
filter->writeSettings(settings);
@@ -133,7 +133,7 @@ void FindToolWindow::writeSettings()
void FindToolWindow::readSettings()
{
QSettings *settings = m_plugin->core()->settings();
QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find");
foreach (IFindFilter *filter, m_filters)
filter->readSettings(settings);