feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Merge Find and Locator into Core plugin

Browse Source 
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-01-13 16:17:34 +01:00
committed by Eike Ziller
parent 8b854270a6
commit 4d96fa7aba
239 changed files with 1625 additions and 1787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/coreplugin/coreplugin.cpp
View File

@@ -35,8 +35,11 @@
#include "mimedatabase.h"
#include "modemanager.h"
#include "infobar.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/find/findplugin.h>
#include <coreplugin/locator/locatorplugin.h>
#include <utils/savefile.h>
@@ -51,10 +54,15 @@ CorePlugin::CorePlugin() : m_editMode(0), m_designMode(0)
{
qRegisterMetaType<Core::Id>();
m_mainWindow = new MainWindow;
m_findPlugin = new FindPlugin;
m_locatorPlugin = new LocatorPlugin;
}
CorePlugin::~CorePlugin()
{
delete m_findPlugin;
delete m_locatorPlugin;
if (m_editMode) {
removeObject(m_editMode);
delete m_editMode;
@@ -98,6 +106,9 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
// Make sure we respect the process's umask when creating new files
Utils::SaveFile::initializeUmask();
m_findPlugin->initialize(arguments, errorMessage);
m_locatorPlugin->initialize(this, arguments, errorMessage);
return success;
}
@@ -107,11 +118,14 @@ void CorePlugin::extensionsInitialized()
if (m_designMode->designModeIsRequired())
addObject(m_designMode);
m_mainWindow->extensionsInitialized();
m_findPlugin->extensionsInitialized();
m_locatorPlugin->extensionsInitialized();
}
bool CorePlugin::delayedInitialize()
{
HelpManager::setupHelpManager();
m_locatorPlugin->delayedInitialize();
return true;
}